]> TLD Linux GIT Repositories - packages/llvm.git/blobdiff - llvm-tld.patch
TLD / packages / llvm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 19.1.7
[packages/llvm.git] / llvm-tld.patch
diff --git a/llvm-tld.patch b/llvm-tld.patch
index fd7cbe39e8e3efa305ca1a45b6a25b507f32e8bd..6548b032e927674403d0826cf5523e074ee55747 100644 (file)
--- a/llvm-tld.patch
+++ b/llvm-tld.patch
@@ -1,76 +1,74 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' llvm-3.9.0.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.9.0.src/tools/clang/lib/Driver/ToolChains.cpp
---- llvm-3.9.0.src.orig/tools/clang/lib/Driver/ToolChains.cpp  2016-08-18 19:56:48.000000000 +0200
-+++ llvm-3.9.0.src/tools/clang/lib/Driver/ToolChains.cpp       2016-11-03 12:18:35.000000000 +0100
-@@ -1498,6 +1498,7 @@
+diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Distro.h llvm-19.1.5.src/tools/clang/include/clang/Driver/Distro.h
+--- llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Distro.h      2024-12-03 08:46:10.000000000 +0100
++++ llvm-19.1.5.src/tools/clang/include/clang/Driver/Distro.h  2024-12-23 14:15:31.732367771 +0100
+@@ -30,6 +30,7 @@ public:
+     // the first and last known member in the family, e.g. IsRedHat().
+     AlpineLinux,
+     ArchLinux,
++    TLDLinux,
+     DebianLenny,
+     DebianSqueeze,
+     DebianWheezy,
+@@ -138,6 +139,10 @@ public:
+ 
+   bool IsGentoo() const { return DistroVal == Gentoo; }
+ 
++  bool IsTLD() {
++    return DistroVal == TLDLinux;
++  }
++
+   /// @}
+ };
+ 
+diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/Distro.cpp llvm-19.1.5.src/tools/clang/lib/Driver/Distro.cpp
+--- llvm-19.1.5.src.org/tools/clang/lib/Driver/Distro.cpp      2024-12-03 08:46:10.000000000 +0100
++++ llvm-19.1.5.src/tools/clang/lib/Driver/Distro.cpp  2024-12-23 14:15:31.732367771 +0100
+@@ -205,6 +205,9 @@ static Distro::DistroType DetectDistro(l
+   if (VFS.exists("/etc/gentoo-release"))
+     return Distro::Gentoo;
+ 
++  if (VFS.exists("/etc/tld-release"))
++    return Distro::TLDLinux;
++
+   return Distro::UnknownDistro;
+ }
+ 
+diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp
+--- llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp      2024-12-03 08:46:10.000000000 +0100
++++ llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp  2024-12-23 14:15:31.732367771 +0100
+@@ -2463,6 +2463,7 @@ void Generic_GCC::GCCInstallationDetecto
+   // lists should shrink over time. Please don't add more elements to *Triples.
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
++      "aarch64-tld-linux",
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+       "aarch64-suse-linux"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+@@ -2488,6 +2489,7 @@ void Generic_GCC::GCCInstallationDetecto
  
    static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
    static const char *const X86_64Triples[] = {
  
    static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
    static const char *const X86_64Triples[] = {
-+      "x86_64-tld-linux",
++      "x86_64-tld-linux", "amd64-tld-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",
        "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",
-@@ -1507,6 +1508,7 @@
-   static const char *const X32LibDirs[] = {"/libx32"};
+@@ -2498,6 +2500,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-tld-linux",
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
 +      "i686-tld-linux",
-       "i686-linux-gnu",       "i686-pc-linux-gnu",     "i486-linux-gnu",
-       "i386-linux-gnu",       "i386-redhat-linux6E",   "i686-redhat-linux",
-       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
-   static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
-@@ -3716,6 +3719,7 @@
-   // in this enum, because some tests are done by integer comparison against
-   // the first and last known member in the family, e.g. IsRedHat().
-   ArchLinux,
-+  TLDLinux,
-   DebianLenny,
-   DebianSqueeze,
-   DebianWheezy,
-@@ -3761,6 +3765,10 @@
-   return Distro >= UbuntuHardy && Distro <= UbuntuXenial;
- }
- 
-+static bool IsTLD(enum Distro Distro) {
-+  return Distro == TLDLinux;
-+}
-+
- static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) {
-   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-       llvm::MemoryBuffer::getFile("/etc/lsb-release");
-@@ -3837,6 +3845,9 @@
-   if (D.getVFS().exists("/etc/arch-release"))
-     return ArchLinux;
- 
-+  if (!llvm::sys::fs::exists("/etc/tld-release"))
-+    return TLDLinux;
-+
-   return UnknownDistro;
- }
- 
-@@ -4012,7 +4023,7 @@
- 
-   Distro Distro = DetectDistro(D, Arch);
+       "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+       "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+       "i586-suse-linux",     "i686-montavista-linux",
+diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Linux.cpp
+--- llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp    2024-12-03 08:46:10.000000000 +0100
++++ llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Linux.cpp        2024-12-23 14:15:31.732367771 +0100
+@@ -234,7 +234,7 @@ Linux::Linux(const Driver &D, const llvm
+     ExtraOpts.push_back("now");
+   }
  
  
--  if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
-+  if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsTLD(Distro)) {
+-  if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() ||
++  if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || Distro.IsTLD() ||
+       Triple.isAndroid()) {
      ExtraOpts.push_back("-z");
      ExtraOpts.push_back("relro");
      ExtraOpts.push_back("-z");
      ExtraOpts.push_back("relro");
-   }
-@@ -4032,7 +4043,7 @@
-   // ABI requires a mapping between the GOT and the symbol table.
-   // Android loader does not support .gnu.hash.
-   if (!IsMips && !IsAndroid) {
--    if (IsRedhat(Distro) || IsOpenSUSE(Distro) ||
-+    if (IsRedhat(Distro) || IsOpenSUSE(Distro) || IsTLD(Distro) ||
-         (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
-       ExtraOpts.push_back("--hash-style=gnu");
- 
-@@ -4041,7 +4052,7 @@
-       ExtraOpts.push_back("--hash-style=both");
-   }
- 
--  if (IsRedhat(Distro) && Distro != RHEL5 && Distro != RHEL6)
-+  if ((IsRedhat(Distro) && Distro != RHEL5 && Distro != RHEL6) || IsTLD(Distro))
-     ExtraOpts.push_back("--no-add-needed");
- 
- #ifdef ENABLE_LINKER_BUILD_ID
The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)