diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-devel/clang/files/6.0.1 | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'sys-devel/clang/files/6.0.1')
-rw-r--r-- | sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 | ||||
-rw-r--r-- | sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch | 18 |
2 files changed, 0 insertions, 48 deletions
diff --git a/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch deleted file mode 100644 index 0c6644891069..000000000000 --- a/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - diff --git a/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch b/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch deleted file mode 100644 index 7744b942d0e5..000000000000 --- a/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/Frontend/InitHeaderSearch.cpp -+++ b/lib/Frontend/InitHeaderSearch.cpp -@@ -233,6 +233,7 @@ - case llvm::Triple::Bitrig: - break; - default: -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); - // FIXME: temporary hack: hard-coded paths. - AddPath("/usr/local/include", System, false); - break; -@@ -505,6 +506,7 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } |