- merged 16.0.6 from PLD

[packages/llvm.git] / x32-gcc-toolchain.patch

diff --git a/x32-gcc-toolchain.patch b/x32-gcc-toolchain.patch
index 701d570ecf4d3a19144317917a5825d24d59a292..b551b903b51d5276203d202c2555f8c88a8990fe 100644 (file)
--- a/x32-gcc-toolchain.patch
+++ b/x32-gcc-toolchain.patch
@@ -1,37 +1,31 @@
---- llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp~  2015-07-26 12:48:18.000000000 +0200
-+++ llvm-5.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp   2015-07-26 17:44:56.883613971 +0200
-@@ -1312,6 +1312,9 @@
-       "x86_64-slackware-linux", "x86_64-linux-android",
-       "x86_64-unknown-linux"};
-   static const char *const X32LibDirs[] = {"/libx32"};
+--- llvm-13.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig     2021-10-25 20:48:42.045696956 +0200
++++ llvm-13.0.0.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp  2021-10-25 20:56:43.802012798 +0200
+@@ -2113,8 +2113,9 @@
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+       "x86_64-amazon-linux"};
+-  static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+-                                           "x86_64-pc-linux-gnux32"};
 +  static const char *const X32Triples[] = {
 +      "x86_64-pld-linux-gnux32", "amd64-pld-linux-gnux32",
 +      "x86_64-linux-gnux32", "x86_64-unknown-linux-gnux32", "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
-       "i686-pld-linux", "i586-pld-linux", "i486-pld-linux", "i386-pld-linux", "athlon-pld-linux",
-@@ -1407,15 +1407,19 @@
-     }
-     break;
-   case llvm::Triple::x86_64:
--    LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
--    TripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
--    // x32 is always available when x86_64 is available, so adding it as
--    // secondary arch with x86_64 triples
-     if (TargetTriple.getEnvironment() == llvm::Triple::GNUX32) {
--      BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs));
-+      LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
-+      TripleAliases.append(begin(X32Triples), end(X32Triples));
-+      BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
+@@ -2352,12 +2353,16 @@
+       LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
+       TripleAliases.append(begin(X32Triples), end(X32Triples));
+       BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
 +      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
        BiarchTripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
 +      BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
      } else {
-+      LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
-+      TripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
-+      BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs));
-       BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
-+      BiarchTripleAliases.append(begin(X32Triples), end(X32Triples));
-       BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
+       LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
+       TripleAliases.append(begin(X86_64Triples), end(X86_64Triples));
+       BiarchLibDirs.append(begin(X32LibDirs), end(X32LibDirs));
++      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
+       BiarchTripleAliases.append(begin(X32Triples), end(X32Triples));
++      BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));
      }
-     break;
+     BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
+     BiarchTripleAliases.append(begin(X86Triples), end(X86Triples));