aboutsummaryrefslogtreecommitdiff
blob: 0c6644891069ac2693ded6e1b143167e8728476b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 19 Mar 2018 20:55:47 +0100
Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for
 -rtlib=compiler-rt

Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match
specifically 'clang_rt.cfi' rather than any compiler-rt library. This
fixes the failure when the linker command-line contains
clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt.
---
 test/Driver/sanitizer-ld.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c
index 0da4255f69..9309450186 100644
--- a/test/Driver/sanitizer-ld.c
+++ b/test/Driver/sanitizer-ld.c
@@ -514,7 +514,7 @@
 // RUN:     --sysroot=%S/Inputs/basic_android_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s
 // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}"
-// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.
+// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi
 
 // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime.
 // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \
-- 
2.16.2