commit f0b29ff0a0f76e8f6b25fb79792250d9bcea9605
author George Karpenkov <ekarpenkov@apple.com> Thu Oct 12 10:50:15 2017 -0700
committer George Karpenkov <ekarpenkov@apple.com> Thu Oct 12 10:50:15 2017 -0700
tree a1cb76428e3221ba87ecd908fc587ea8e48e0e75
parent d227431b273e67731954da518e416824bf02f048

Fix merge conflict resulting from cherry-picking.

test/Driver/fuzzer.c

diff --git a/test/Driver/fuzzer.c b/test/Driver/fuzzer.c
index 4d75ab0..083f950 100644
--- a/test/Driver/fuzzer.c
+++ b/test/Driver/fuzzer.c
@@ -25,11 +25,6 @@
 // CHECK-NOLIB-NOT: libclang_rt.libfuzzer
 // CHECK-COV: -fsanitize-coverage-trace-pc-guard
 
-// Check that we don't link in libFuzzer when compiling with -fsanitize=fuzzer-no-link.
-// RUN: %clang -fsanitize=fuzzer-no-link %s -target x86_64-apple-darwin14 -### 2>&1 | FileCheck --check-prefixes=CHECK-NOLIB,CHECK-COV %s
-// CHECK-NOLIB-NOT: libclang_rt.libfuzzer
-// CHECK-COV: -fsanitize-coverage-trace-pc-guard
-
 // RUN: %clang -fsanitize=fuzzer -fsanitize-coverage=trace-pc %s -### 2>&1 | FileCheck --check-prefixes=CHECK-MSG %s
 // CHECK-MSG-NOT: argument unused during compilation