X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=llvm-pld.patch;h=cd84f6ac7c5251b6c1728a0618ec87a4d5f46ece;hb=8d52ede4adea642c397c0a2a6d017de124ebb451;hp=01a25c6119f62e3ce6e68a657cb1e3db55c78405;hpb=4ad1976b9a08393522e3078b3f379a0ec4999b08;p=packages%2Fllvm.git

diff --git a/llvm-pld.patch b/llvm-pld.patch
index 01a25c6..cd84f6a 100644
--- a/llvm-pld.patch
+++ b/llvm-pld.patch
@@ -1,79 +1,126 @@
---- llvm-3.0./tools/clang/lib/Driver/ToolChains.cpp.orig	2012-02-09 11:41:41.000000000 +0100
-+++ llvm-3.0./tools/clang/lib/Driver/ToolChains.cpp	2012-02-09 12:25:54.844008378 +0100
-@@ -1378,6 +1378,7 @@
+diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/include/clang/Driver/Distro.h llvm-11.0.1.src/tools/clang/include/clang/Driver/Distro.h
+--- llvm-11.0.1.src.org/tools/clang/include/clang/Driver/Distro.h	2020-12-18 20:57:38.000000000 +0100
++++ llvm-11.0.1.src/tools/clang/include/clang/Driver/Distro.h	2021-03-25 22:27:39.173689051 +0100
+@@ -28,6 +28,7 @@ public:
+     // the first and last known member in the family, e.g. IsRedHat().
+     AlpineLinux,
+     ArchLinux,
++    PLDLinux,
+     DebianLenny,
+     DebianSqueeze,
+     DebianWheezy,
+@@ -132,6 +133,10 @@ public:
  
- enum LinuxDistro {
-   ArchLinux,
-+  PLDLinux,
-   DebianLenny,
-   DebianSqueeze,
-   DebianWheezy,
-@@ -1426,6 +1427,10 @@
-          Distro == UbuntuNatty  || Distro == UbuntuOneiric;
- }
+   bool IsGentoo() const { return DistroVal == Gentoo; }
  
-+static bool IsPLD(enum LinuxDistro Distro) {
-+  return Distro == PLDLinux;
-+}
++  bool IsPLD() {
++    return DistroVal == PLDLinux;
++  }
 +
- static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
-   llvm::OwningPtr<llvm::MemoryBuffer> File;
-   if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
-@@ -1507,6 +1512,9 @@
-   if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists)
-     return ArchLinux;
+   /// @}
+ };
+ 
+diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/Distro.cpp llvm-11.0.1.src/tools/clang/lib/Driver/Distro.cpp
+--- llvm-11.0.1.src.org/tools/clang/lib/Driver/Distro.cpp	2020-12-18 20:57:38.000000000 +0100
++++ llvm-11.0.1.src/tools/clang/lib/Driver/Distro.cpp	2021-03-25 22:27:39.173689051 +0100
+@@ -165,6 +165,9 @@ static Distro::DistroType DetectDistro(l
+   if (VFS.exists("/etc/gentoo-release"))
+     return Distro::Gentoo;
  
-+  if (!llvm::sys::fs::exists("/etc/pld-release", Exists) && Exists)
-+    return PLDLinux;
++  if (VFS.exists("/etc/pld-release"))
++    return Distro::PLDLinux;
 +
-   return UnknownDistro;
+   return Distro::UnknownDistro;
  }
  
-@@ -1647,6 +1655,7 @@
-   } else if (HostArch == llvm::Triple::x86_64) {
-     static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
-     static const char *const X86_64Triples[] = {
-+      "x86_64-pld-linux",
-       "x86_64-linux-gnu",
-       "x86_64-unknown-linux-gnu",
-       "x86_64-pc-linux-gnu",
-@@ -1664,6 +1673,8 @@
-   } else if (HostArch == llvm::Triple::x86) {
-     static const char *const X86LibDirs[] = { "/lib32", "/lib" };
-     static const char *const X86Triples[] = {
-+      "i486-pld-linux",
-+      "i686-pld-linux",
-       "i686-linux-gnu",
-       "i686-pc-linux-gnu",
-       "i486-linux-gnu",
-@@ -1802,7 +1813,7 @@
+diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp
+--- llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp	2020-12-18 20:57:38.000000000 +0100
++++ llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp	2021-03-25 22:27:39.173689051 +0100
+@@ -2048,6 +2048,7 @@ void Generic_GCC::GCCInstallationDetecto
+   // lifetime or initialization issues.
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
++      "aarch64-pld-linux",
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+       "aarch64-suse-linux", "aarch64-linux-android"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+@@ -2055,9 +2056,14 @@ void Generic_GCC::GCCInstallationDetecto
+                                                  "aarch64_be-linux-gnu"};
  
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
+   static const char *const ARMLibDirs[] = {"/lib"};
+-  static const char *const ARMTriples[] = {"arm-linux-gnueabi",
++  static const char *const ARMTriples[] = {"arm-pld-linux-gnueabi",
++                                           "arm-linux-gnueabi",
+                                            "arm-linux-androideabi"};
+-  static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
++  static const char *const ARMHFTriples[] = {"arm-pld-linux-gnueabihf",
++                                             "armv6hl-pld-linux-gnueabi",
++                                             "armv7hl-pld-linux-gnueabi",
++                                             "armv7hnl-pld-linux-gnueabi",
++                                             "arm-linux-gnueabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+                                              "armv7hl-suse-linux-gnueabi"};
+@@ -2072,6 +2077,7 @@ void Generic_GCC::GCCInstallationDetecto
  
--  if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-+  if (IsOpenSuse(Distro) || IsUbuntu(Distro) || IsPLD(Distro)) {
-     ExtraOpts.push_back("-z");
-     ExtraOpts.push_back("relro");
-   }
-@@ -1811,18 +1822,18 @@
-     ExtraOpts.push_back("-X");
+   static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const X86_64Triples[] = {
++      "x86_64-pld-linux", "amd64-pld-linux",
+       "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
+       "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+@@ -2081,6 +2087,7 @@ void Generic_GCC::GCCInstallationDetecto
+   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",
+       "i586-linux-gnu",     "i686-linux-gnu",
+       "i686-pc-linux-gnu",  "i386-redhat-linux6E",
+       "i686-redhat-linux",  "i386-redhat-linux",
+@@ -2121,6 +2128,7 @@ void Generic_GCC::GCCInstallationDetecto
  
-   if (IsRedhat(Distro) || IsOpenSuse(Distro) || Distro == UbuntuMaverick ||
--      Distro == UbuntuNatty || Distro == UbuntuOneiric)
-+      Distro == UbuntuNatty || Distro == UbuntuOneiric || IsPLD(Distro))
-     ExtraOpts.push_back("--hash-style=gnu");
+   static const char *const PPCLibDirs[] = {"/lib32", "/lib"};
+   static const char *const PPCTriples[] = {
++      "powerpc-pld-linux",
+       "powerpc-linux-gnu", "powerpc-unknown-linux-gnu", "powerpc-linux-gnuspe",
+       // On 32-bit PowerPC systems running SUSE Linux, gcc is configured as a
+       // 64-bit compiler which defaults to "-m32", hence "powerpc64-suse-linux".
+@@ -2146,14 +2154,14 @@ void Generic_GCC::GCCInstallationDetecto
+                                                "riscv64-suse-linux"};
  
-   if (IsDebian(Distro) || IsOpenSuse(Distro) || Distro == UbuntuLucid ||
-       Distro == UbuntuJaunty || Distro == UbuntuKarmic)
-     ExtraOpts.push_back("--hash-style=both");
+   static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
+-  static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
++  static const char *const SPARCv8Triples[] = {"sparc-pld-linux", "sparc-linux-gnu",
+                                                "sparcv8-linux-gnu"};
+   static const char *const SPARCv9LibDirs[] = {"/lib64", "/lib"};
+-  static const char *const SPARCv9Triples[] = {"sparc64-linux-gnu",
++  static const char *const SPARCv9Triples[] = {"sparc64-pld-linux", "sparc64-linux-gnu",
+                                                "sparcv9-linux-gnu"};
  
--  if (IsRedhat(Distro))
-+  if (IsRedhat(Distro) || IsPLD(Distro))
-     ExtraOpts.push_back("--no-add-needed");
+   static const char *const SystemZLibDirs[] = {"/lib64", "/lib"};
+-  static const char *const SystemZTriples[] = {
++  static const char *const SystemZTriples[] = {"s390x-pld-linux",
+       "s390x-linux-gnu", "s390x-unknown-linux-gnu", "s390x-ibm-linux-gnu",
+       "s390x-suse-linux", "s390x-redhat-linux"};
  
-   if (Distro == DebianSqueeze || Distro == DebianWheezy ||
--      IsOpenSuse(Distro) ||
-+      IsOpenSuse(Distro) || IsPLD(Distro) ||
-       (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
-       Distro == UbuntuLucid ||
-       Distro == UbuntuMaverick || Distro == UbuntuKarmic ||
+diff -urNp -x '*.orig' llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Linux.cpp
+--- llvm-11.0.1.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp	2020-12-18 20:57:38.000000000 +0100
++++ llvm-11.0.1.src/tools/clang/lib/Driver/ToolChains/Linux.cpp	2021-03-25 22:27:39.173689051 +0100
+@@ -226,7 +226,7 @@ Linux::Linux(const Driver &D, const llvm
+     ExtraOpts.push_back("now");
+   }
+ 
+-  if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
++  if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
+       Triple.isAndroid()) {
+     ExtraOpts.push_back("-z");
+     ExtraOpts.push_back("relro");
+@@ -266,7 +266,7 @@ Linux::Linux(const Driver &D, const llvm
+   // Android loader does not support .gnu.hash until API 23.
+   // Hexagon linker/loader does not support .gnu.hash
+   if (!IsMips && !IsHexagon) {
+-    if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() ||
++    if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || Distro.IsPLD() ||
+         (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) ||
+         (IsAndroid && !Triple.isAndroidVersionLT(23)))
+       ExtraOpts.push_back("--hash-style=gnu");