aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/clang/files')
-rw-r--r--sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch55
-rw-r--r--sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch30
-rw-r--r--sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch33
-rw-r--r--sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch11
-rw-r--r--sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch25
-rw-r--r--sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch12
-rw-r--r--sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch35
-rw-r--r--sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch11
-rw-r--r--sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch30
-rw-r--r--sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch18
10 files changed, 0 insertions, 260 deletions
diff --git a/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch b/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch
deleted file mode 100644
index 20ba89b..0000000
--- a/sys-devel/clang/files/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 99418eabfbe5378d7a751444856c6c5c656519c4 Mon Sep 17 00:00:00 2001
-From: Serge Pavlov <sepavloff@gmail.com>
-Date: Mon, 19 Mar 2018 16:13:43 +0000
-Subject: [PATCH 1/2] [Driver] Avoid invalidated iterator in
- insertTargetAndModeArgs
-
-Doing an .insert() can potentially invalidate iterators by reallocating the
-vector's storage. When all the stars align just right, this causes segfaults
-or glibc aborts.
-
-Gentoo Linux bug (crashes while building Chromium): https://bugs.gentoo.org/650082.
-
-Patch by Hector Martin!
-
-Differential Revision: https://reviews.llvm.org/D44607
-
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327863 91177308-0d34-0410-b5e6-96231b3b80d8
----
- tools/driver/driver.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
-index fa757da953..1b614accb2 100644
---- a/tools/driver/driver.cpp
-+++ b/tools/driver/driver.cpp
-@@ -212,20 +212,21 @@ static void insertTargetAndModeArgs(const ParsedClangName &NameParts,
- // Put target and mode arguments at the start of argument list so that
- // arguments specified in command line could override them. Avoid putting
- // them at index 0, as an option like '-cc1' must remain the first.
-- auto InsertionPoint = ArgVector.begin();
-- if (InsertionPoint != ArgVector.end())
-+ int InsertionPoint = 0;
-+ if (ArgVector.size() > 0)
- ++InsertionPoint;
-
- if (NameParts.DriverMode) {
- // Add the mode flag to the arguments.
-- ArgVector.insert(InsertionPoint,
-+ ArgVector.insert(ArgVector.begin() + InsertionPoint,
- GetStableCStr(SavedStrings, NameParts.DriverMode));
- }
-
- if (NameParts.TargetIsValid) {
- const char *arr[] = {"-target", GetStableCStr(SavedStrings,
- NameParts.TargetPrefix)};
-- ArgVector.insert(InsertionPoint, std::begin(arr), std::end(arr));
-+ ArgVector.insert(ArgVector.begin() + InsertionPoint,
-+ std::begin(arr), std::end(arr));
- }
- }
-
---
-2.16.2
-
diff --git a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch
deleted file mode 100644
index 0c66448..0000000
--- a/sys-devel/clang/files/6.0.0/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.0/0003-Add-Gentoo-Linux-distro.patch b/sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch
deleted file mode 100644
index a11dcfe..0000000
--- a/sys-devel/clang/files/6.0.0/0003-Add-Gentoo-Linux-distro.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/include/clang/Driver/Distro.h
-+++ b/include/clang/Driver/Distro.h
-@@ -26,6 +26,7 @@ public:
- // NB: Releases of a particular Linux distro should be kept together
- // in this enum, because some tests are done by integer comparison against
- // the first and last known member in the family, e.g. IsRedHat().
-+ GentooLinux,
- AlpineLinux,
- ArchLinux,
- DebianLenny,
-@@ -98,6 +99,10 @@ public:
- /// @name Convenience Predicates
- /// @{
-
-+ bool IsGentooLinux() const {
-+ return DistroVal == GentooLinux;
-+ }
-+
- bool IsRedhat() const {
- return DistroVal == Fedora || (DistroVal >= RHEL5 && DistroVal <= RHEL7);
- }
---- a/lib/Driver/Distro.cpp
-+++ b/lib/Driver/Distro.cpp
-@@ -129,6 +129,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) {
- if (VFS.exists("/etc/arch-release"))
- return Distro::ArchLinux;
-
-+ if (VFS.exists("/etc/gentoo-release"))
-+ return Distro::GentooLinux;
-+
- return Distro::UnknownDistro;
- }
-
diff --git a/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch b/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch
deleted file mode 100644
index 653c933..0000000
--- a/sys-devel/clang/files/6.0.0/hardened/0001-Use-z-relro-on-Gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -210,7 +210,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
-
- Distro Distro(D.getVFS());
-
-- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) {
-+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsGentooLinux()) {
- ExtraOpts.push_back("-z");
- ExtraOpts.push_back("relro");
- }
diff --git a/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch
deleted file mode 100644
index 2f5faf5..0000000
--- a/sys-devel/clang/files/6.0.0/hardened/0002-Enable-Stack-Protector-by-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -820,6 +820,10 @@ bool Linux::isPIEDefault() const {
- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
- }
-
-+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
-+ return 2;
-+}
-+
- SanitizerMask Linux::getSupportedSanitizers() const {
- const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
- const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
-diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
-index 9778c1832cc..ddd46a1d587 100644
---- a/lib/Driver/ToolChains/Linux.h
-+++ b/lib/Driver/ToolChains/Linux.h
-@@ -36,6 +36,7 @@ public:
- void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
- llvm::opt::ArgStringList &CC1Args) const override;
- bool isPIEDefault() const override;
-+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
- SanitizerMask getSupportedSanitizers() const override;
- void addProfileRTLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
diff --git a/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch
deleted file mode 100644
index 2b9ad5e..0000000
--- a/sys-devel/clang/files/6.0.0/hardened/0003-Enable-PIE-by-default.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -816,8 +816,7 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
- }
-
- bool Linux::isPIEDefault() const {
-- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
-- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
-+ return true;
- }
-
- unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
diff --git a/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch b/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch
deleted file mode 100644
index 410bae9..0000000
--- a/sys-devel/clang/files/6.0.0/hardened/0004-Enable-FORTIFY_SOURCE-macro-by-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 68d39575cdff576b85907bea8e42b7ef26384dbb Mon Sep 17 00:00:00 2001
-From: Matthias Dahl <matthias.dahl@binary-island.eu>
-Date: Wed, 20 Sep 2017 16:17:31 +0200
-Subject: [PATCH 3/3] Enable FORTIFY_SOURCE macro by default
-
-FORTIFY_SOURCE only works for optimization levels > 0 and is currently not
-compatible with the address sanitizer, thus the macro is only set if the input
-language is C or C++ and the optimization level > 0 while the address sanitizer
-is not requested.
----
- lib/Frontend/CompilerInvocation.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
-index 0d0869c815d..88c16534103 100644
---- a/lib/Frontend/CompilerInvocation.cpp
-+++ b/lib/Frontend/CompilerInvocation.cpp
-@@ -2694,6 +2694,14 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Res,
- !LangOpts.Sanitize.has(SanitizerKind::Address) &&
- !LangOpts.Sanitize.has(SanitizerKind::Memory);
-
-+ // Set the macro before the command line macros are being processed, so it can be
-+ // properly unset if required to in case of incompatibilities.
-+ if (Res.getCodeGenOpts().OptimizationLevel > 0 &&
-+ (DashX.getLanguage() == InputKind::C || DashX.getLanguage() == InputKind::CXX) &&
-+ !LangOpts.Sanitize.has(SanitizerKind::Address)) {
-+ Res.getPreprocessorOpts().addMacroDef("_FORTIFY_SOURCE=2");
-+ }
-+
- // FIXME: ParsePreprocessorArgs uses the FileManager to read the contents of
- // PCH file and find the original header name. Remove the need to do that in
- // ParsePreprocessorArgs and remove the FileManager
---
-2.14.1
-
diff --git a/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch b/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch
deleted file mode 100644
index 28942ae..0000000
--- a/sys-devel/clang/files/6.0.0/hardened/0005-Link-with-z-now-by-default-for-Gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -210,7 +210,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
-
- Distro Distro(D.getVFS());
-
-- if (Distro.IsAlpineLinux()) {
-+ if (Distro.IsAlpineLinux() || Distro.IsGentooLinux()) {
- ExtraOpts.push_back("-z");
- ExtraOpts.push_back("now");
- }
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 0c66448..0000000
--- 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 7744b94..0000000
--- 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);
- }