diff --git a/0001-Reorganize-gtest-integration.patch b/0001-Reorganize-gtest-integration.patch index 0d36adc..72df775 100644 --- a/0001-Reorganize-gtest-integration.patch +++ b/0001-Reorganize-gtest-integration.patch @@ -1,4 +1,4 @@ -From cb7b3a4d8f15cd5d1546446656a5083f9fc826eb Mon Sep 17 00:00:00 2001 +From b2b005d7b75471e927a3b80561518a888f32f8f0 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 25 Feb 2021 14:04:52 +0100 Subject: Reorganize gtest integration diff --git a/0002-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch b/0002-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch index ac3c8e5..7cfea18 100644 --- a/0002-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch +++ b/0002-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch @@ -1,4 +1,4 @@ -From 8360e0e8d1f8c3f28ff21e4e92c81d8dfc749e82 Mon Sep 17 00:00:00 2001 +From 870d7d18401f2d3680fd134266bf959e8bf0b56f Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 25 Feb 2021 14:08:28 +0100 Subject: ToolChain: Add -lgcc_s to the linker flags when using libc++ diff --git a/0003-Make-funwind-tables-the-default-on-all-archs.patch b/0003-Make-funwind-tables-the-default-on-all-archs.patch index 830a41f..591c744 100644 --- a/0003-Make-funwind-tables-the-default-on-all-archs.patch +++ b/0003-Make-funwind-tables-the-default-on-all-archs.patch @@ -1,4 +1,4 @@ -From 7e235e92397b954cff12660a492f95333fb3d68e Mon Sep 17 00:00:00 2001 +From 5078a2cbc42266f35d19b491f75b1ff52a12227f Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 25 Feb 2021 14:09:29 +0100 Subject: Make -funwind-tables the default on all archs @@ -22,7 +22,7 @@ index ef95dd8b882d..b83bd6d3ca5d 100644 Tool *ToolChain::getClang() const { diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index d0808d061c82..a9ae51289190 100644 +index bb3cba6dc4f7..f0dcae58f63d 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2703,7 +2703,7 @@ bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const { diff --git a/0004-Don-t-install-static-libraries.patch b/0004-Don-t-install-static-libraries.patch index 6b83f51..38b9156 100644 --- a/0004-Don-t-install-static-libraries.patch +++ b/0004-Don-t-install-static-libraries.patch @@ -1,4 +1,4 @@ -From 89f32fece081722e707eb413654d48b5f8b82d9b Mon Sep 17 00:00:00 2001 +From 5fd3c55864ae1bed00f927bbe7d1084a2d5bdeb6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 31 Jan 2020 11:04:57 -0800 Subject: Don't install static libraries diff --git a/0005-Prefer-gcc-toolchains-with-libgcc_s.so-when-not-stat.patch b/0005-Prefer-gcc-toolchains-with-libgcc_s.so-when-not-stat.patch index 4ca6da9..f5971e5 100644 --- a/0005-Prefer-gcc-toolchains-with-libgcc_s.so-when-not-stat.patch +++ b/0005-Prefer-gcc-toolchains-with-libgcc_s.so-when-not-stat.patch @@ -1,4 +1,4 @@ -From f70ad66b2a85d2a6cca8a9a9d12fd174e40f00fc Mon Sep 17 00:00:00 2001 +From 57310cafc13eaa55f9ac2c41ce329bfda185e1a4 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 23 Sep 2020 12:47:30 +0000 Subject: Prefer gcc toolchains with libgcc_s.so when not static linking libgcc @@ -32,7 +32,7 @@ toolchain. create mode 100644 clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-linux/7/libgcc_s.so diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index a9ae51289190..6915857c424e 100644 +index f0dcae58f63d..19b39b7b2c81 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2528,6 +2528,8 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple( @@ -104,7 +104,7 @@ diff --git a/clang/test/Driver/Inputs/fedora_28_tree/usr/lib/gcc/x86_64-redhat-l new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c -index fc0a40d0cbe6..6884bcdaa54a 100644 +index 4c40eb3583a0..5361bc5c6f2d 100644 --- a/clang/test/Driver/linux-ld.c +++ b/clang/test/Driver/linux-ld.c @@ -687,6 +687,18 @@ @@ -123,7 +123,7 @@ index fc0a40d0cbe6..6884bcdaa54a 100644 +// CHECK-FEDORA-28-X86_64: "[[SYSROOT]]/usr/lib/gcc/x86_64-redhat-linux/7/crtbegin.o" +// CHECK-FEDORA-28-X86_64: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-redhat-linux/7" +// - // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ + // RUN: %clang -no-canonical-prefixes %s -no-pie -### -o %t.o 2>&1 \ // RUN: --target=arm-unknown-linux-gnueabi -rtlib=platform \ // RUN: --gcc-toolchain="" \ -- diff --git a/0006-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch b/0006-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch index fbdf775..d299ff0 100644 --- a/0006-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch +++ b/0006-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch @@ -1,4 +1,4 @@ -From 453e5af5763a6368dd5e77c87b0a808c092a50d2 Mon Sep 17 00:00:00 2001 +From d7e7658f44d5317783e01b821d3fe68ebeebab3e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 11 Nov 2021 10:58:14 +0100 Subject: Driver: Add a gcc equivalent triple to the list of triples to search @@ -14,7 +14,7 @@ https://reviews.llvm.org/D111207 1 file changed, 22 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp -index 6915857c424e..035ab5b338d2 100644 +index 19b39b7b2c81..76548f4d6888 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -1876,6 +1876,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args, diff --git a/0007-Work-around-gcc-miscompile.patch b/0007-Work-around-gcc-miscompile.patch index efd6389..3c4228b 100644 --- a/0007-Work-around-gcc-miscompile.patch +++ b/0007-Work-around-gcc-miscompile.patch @@ -1,4 +1,4 @@ -From 0d58680446685445ab28c908198f6bcff660c6b7 Mon Sep 17 00:00:00 2001 +From d76d03e8784732fa2ec32f74376281ff8a971cf4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 3 Feb 2022 10:34:44 +0100 Subject: Work around gcc miscompile diff --git a/0008-cmake-Allow-shared-libraries-to-customize-the-soname.patch b/0008-cmake-Allow-shared-libraries-to-customize-the-soname.patch index 12708f6..732ed88 100644 --- a/0008-cmake-Allow-shared-libraries-to-customize-the-soname.patch +++ b/0008-cmake-Allow-shared-libraries-to-customize-the-soname.patch @@ -1,4 +1,4 @@ -From 2dba3213cb907dba978a9c076ae3fb35583abbc0 Mon Sep 17 00:00:00 2001 +From 4baaeba1f33517a54a327e1f532746ec4f98aeae Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 4 Aug 2021 14:05:38 -0700 Subject: cmake: Allow shared libraries to customize the soname using diff --git a/0009-Revert-replace-clang-LLVM_ENABLE_PLUGINS-CLANG_PLUGI.patch b/0009-Revert-replace-clang-LLVM_ENABLE_PLUGINS-CLANG_PLUGI.patch index 1623a5f..81e5412 100644 --- a/0009-Revert-replace-clang-LLVM_ENABLE_PLUGINS-CLANG_PLUGI.patch +++ b/0009-Revert-replace-clang-LLVM_ENABLE_PLUGINS-CLANG_PLUGI.patch @@ -1,4 +1,4 @@ -From 6005ae94e5cbd3e320141ba6a81d1c8a9eaa775e Mon Sep 17 00:00:00 2001 +From 8df7f933aedc1319e2c6681641dc8f50d3e8ad25 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Feb 2022 16:31:51 -0800 Subject: Revert "replace clang LLVM_ENABLE_PLUGINS -> CLANG_PLUGIN_SUPPORT in