X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=llvm-pld.patch;h=cd84f6ac7c5251b6c1728a0618ec87a4d5f46ece;hb=ffc473c;hp=0d00ac78711c3f5fbf96dfc85a1ad3fa92b0fa00;hpb=b883cf1e6b04005cc0163f8b0bb13a53a50602c4;p=packages%2Fllvm.git diff --git a/llvm-pld.patch b/llvm-pld.patch index 0d00ac7..cd84f6a 100644 --- a/llvm-pld.patch +++ b/llvm-pld.patch @@ -1,105 +1,126 @@ ---- llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp.orig 2014-10-01 21:07:02.242822402 +0200 -+++ llvm-3.5.0.src/tools/clang/lib/Driver/ToolChains.cpp 2014-10-01 21:29:07.449433463 +0200 -@@ -1333,6 +1333,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: - 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", - "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux", -@@ -1341,6 +1342,7 @@ - static const char *const X32LibDirs[] = { "/libx32" }; - 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", - "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", "i486-slackware-linux", -@@ -1370,6 +1372,7 @@ - - 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", - "powerpc-suse-linux", "powerpc-montavista-linuxspe" - }; -@@ -1385,14 +1388,14 @@ - "ppc64le-redhat-linux" }; + bool IsGentoo() const { return DistroVal == Gentoo; } - 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" }; ++ bool IsPLD() { ++ return DistroVal == PLDLinux; ++ } ++ + /// @} + }; - 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" - }; -@@ -2778,6 +2781,7 @@ +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; - enum Distro { - ArchLinux, -+ PLDLinux, - DebianLenny, - DebianSqueeze, - DebianWheezy, -@@ -2820,6 +2824,10 @@ - return Distro >= UbuntuHardy && Distro <= UbuntuTrusty; ++ if (VFS.exists("/etc/pld-release")) ++ return Distro::PLDLinux; ++ + return Distro::UnknownDistro; } -+static bool IsPLD(enum Distro Distro) { -+ return Distro == PLDLinux; -+} -+ - static Distro DetectDistro(llvm::Triple::ArchType Arch) { - llvm::ErrorOr> File = - llvm::MemoryBuffer::getFile("/etc/lsb-release"); -@@ -2888,6 +2896,9 @@ - if (llvm::sys::fs::exists("/etc/arch-release")) - return ArchLinux; +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"}; -+ if (!llvm::sys::fs::exists("/etc/pld-release")) -+ return PLDLinux; -+ - return UnknownDistro; - } + 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 -@@ -3029,7 +3040,7 @@ + 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 - Distro Distro = DetectDistro(Arch); + 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 (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { -+ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || IsPLD(Distro)) { - ExtraOpts.push_back("-z"); - ExtraOpts.push_back("relro"); - } -@@ -3049,7 +3060,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) || IsPLD(Distro) || - (IsUbuntu(Distro) && Distro >= UbuntuMaverick)) - ExtraOpts.push_back("--hash-style=gnu"); + 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"}; -@@ -3058,11 +3069,11 @@ - ExtraOpts.push_back("--hash-style=both"); - } + 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 (IsRedhat(Distro)) -+ if (IsRedhat(Distro) || IsPLD(Distro)) - ExtraOpts.push_back("--no-add-needed"); +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 == DebianSqueeze || Distro == DebianWheezy || -- Distro == DebianJessie || IsOpenSUSE(Distro) || -+ Distro == DebianJessie || IsOpenSUSE(Distro) || IsPLD(Distro) || - (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) || - (IsUbuntu(Distro) && Distro >= UbuntuKarmic)) - ExtraOpts.push_back("--build-id"); +- 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");