diff --git a/common/shlibs b/common/shlibs index 12436fd3727..1ec4dc5bc69 100644 --- a/common/shlibs +++ b/common/shlibs @@ -992,8 +992,6 @@ libclang.so.18.1 libclang18-18.1.8_1 libclang.so.17 libclang17-17.0.6_1 libclang-cpp.so.18.1 libclang-cpp18-18.1.8_1 libclang-cpp.so.17 libclang-cpp17-17.0.6_1 -libLLVM-11.so libllvm11-11.0.0_1 -libLLVM-12.so libllvm12-12.0.0_1 libLLVM-17.so libllvm17-17.0.6_1 libLLVM.so.18.1 libllvm18-18.1.8_1 libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1 diff --git a/srcpkgs/libllvm12 b/srcpkgs/libllvm12 deleted file mode 120000 index cd60fd7a981..00000000000 --- a/srcpkgs/libllvm12 +++ /dev/null @@ -1 +0,0 @@ -llvm12 \ No newline at end of file diff --git a/srcpkgs/llvm12/files/llvm-Config-llvm-config.h b/srcpkgs/llvm12/files/llvm-Config-llvm-config.h deleted file mode 100644 index 2fa08c9be69..00000000000 --- a/srcpkgs/llvm12/files/llvm-Config-llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch deleted file mode 100644 index e4eaa7783e7..00000000000 --- a/srcpkgs/llvm12/patches/clang-001-fix-unwind-chain-inclusion.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:14:57 +0200 -Subject: [PATCH 2/7] fix unwind chain inclusion - ---- - lib/Headers/unwind.h | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h -index 303d792..44e10cc 100644 ---- a/clang/lib/Headers/unwind.h -+++ b/clang/lib/Headers/unwind.h -@@ -9,9 +9,6 @@ - - /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ - --#ifndef __CLANG_UNWIND_H --#define __CLANG_UNWIND_H -- - #if defined(__APPLE__) && __has_include_next() - /* Darwin (from 11.x on) provide an unwind.h. If that's available, - * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, -@@ -39,6 +36,9 @@ - # endif - #else - -+#ifndef __CLANG_UNWIND_H -+#define __CLANG_UNWIND_H -+ - #include - - #ifdef __cplusplus -@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); - } - #endif - -+#endif /* __CLANG_UNWIND_H */ -+ - #endif - --#endif /* __CLANG_UNWIND_H */ --- -2.5.1 diff --git a/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch deleted file mode 100644 index 25688d40dbc..00000000000 --- a/srcpkgs/llvm12/patches/clang-002-add-musl-triples.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/clang/lib/Driver/ToolChains/Gnu.cpp -+++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi", - "armv6hl-suse-linux-gnueabi", -- "armv7hl-suse-linux-gnueabi"}; -+ "armv7hl-suse-linux-gnueabi", -+ "armv7l-linux-gnueabihf"}; - static const char *const ARMebLibDirs[] = {"/lib"}; - static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", - "armeb-linux-androideabi"}; -@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - "powerpc64-suse-linux", "powerpc-montavista-linuxspe"}; - static const char *const PPCLELibDirs[] = {"/lib32", "/lib"}; - static const char *const PPCLETriples[] = {"powerpcle-linux-gnu", -- "powerpcle-unknown-linux-gnu", -- "powerpcle-linux-musl"}; -+ "powerpcle-unknown-linux-gnu"}; - - static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64Triples[] = { -@@ -2235,6 +2235,87 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - return; - } - -+ if (TargetTriple.isMusl()) { -+ static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"}; -+ static const char *const ARMHFMuslTriples[] = { -+ "arm-linux-musleabihf", "armv7l-linux-musleabihf" -+ }; -+ static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"}; -+ static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"}; -+ static const char *const X86MuslTriples[] = {"i686-linux-musl"}; -+ static const char *const MIPSMuslTriples[] = { -+ "mips-linux-musl", "mipsel-linux-musl", -+ "mipsel-linux-muslhf", "mips-linux-muslhf" -+ }; -+ static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"}; -+ static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"}; -+ static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"}; -+ static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"}; -+ -+ switch (TargetTriple.getArch()) { -+ case llvm::Triple::aarch64: -+ LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); -+ TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); -+ BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); -+ BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); -+ break; -+ case llvm::Triple::arm: -+ LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs)); -+ if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) { -+ TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples)); -+ } else { -+ TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples)); -+ } -+ break; -+ case llvm::Triple::x86_64: -+ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); -+ TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); -+ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); -+ BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); -+ break; -+ case llvm::Triple::x86: -+ LibDirs.append(begin(X86LibDirs), end(X86LibDirs)); -+ TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); -+ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); -+ BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); -+ break; -+ case llvm::Triple::mips: -+ LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs)); -+ TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples)); -+ break; -+ case llvm::Triple::ppc: -+ LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); -+ TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); -+ BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); -+ BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); -+ break; -+ case llvm::Triple::ppcle: -+ LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); -+ TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); -+ BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); -+ BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); -+ break; -+ case llvm::Triple::ppc64: -+ LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); -+ TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); -+ BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); -+ BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); -+ break; -+ case llvm::Triple::ppc64le: -+ LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); -+ TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); -+ BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); -+ BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); -+ break; -+ default: -+ break; -+ } -+ TripleAliases.push_back(TargetTriple.str()); -+ if (TargetTriple.str() != BiarchTriple.str()) -+ BiarchTripleAliases.push_back(BiarchTriple.str()); -+ return; -+ } -+ - // Android targets should not use GNU/Linux tools or libraries. - if (TargetTriple.isAndroid()) { - static const char *const AArch64AndroidTriples[] = { diff --git a/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch deleted file mode 100644 index 4ad6412d1e6..00000000000 --- a/srcpkgs/llvm12/patches/clang-003-ppc64-dynamic-linker-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/clang/lib/Driver/ToolChains/Linux.cpp -+++ b/clang/lib/Driver/ToolChains/Linux.cpp -@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { - Loader = "ld.so.1"; - break; - case llvm::Triple::ppc64: -- LibDir = "lib64"; -- Loader = -- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; -- break; - case llvm::Triple::ppc64le: - LibDir = "lib64"; - Loader = diff --git a/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch deleted file mode 100644 index 21fc8003c5f..00000000000 --- a/srcpkgs/llvm12/patches/clang-004-ppc64-musl-elfv2.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/clang/lib/Basic/Targets/PPC.h -+++ b/clang/lib/Basic/Targets/PPC.h -@@ -415,11 +415,10 @@ public: - LongDoubleFormat = &llvm::APFloat::IEEEdouble(); - } else if ((Triple.getArch() == llvm::Triple::ppc64le)) { - DataLayout = "e-m:e-i64:64-n32:64"; -- ABI = "elfv2"; - } else { - DataLayout = "E-m:e-i64:64-n32:64"; -- ABI = "elfv1"; - } -+ ABI = "elfv2"; - - if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) { - LongDoubleWidth = LongDoubleAlign = 64; ---- a/clang/lib/CodeGen/TargetInfo.cpp -+++ b/clang/lib/CodeGen/TargetInfo.cpp -@@ -10927,9 +10927,9 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() { - return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true)); - - if (Triple.isOSBinFormatELF()) { -- PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1; -- if (getTarget().getABI() == "elfv2") -- Kind = PPC64_SVR4_ABIInfo::ELFv2; -+ PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2; -+ if (getTarget().getABI() == "elfv1") -+ Kind = PPC64_SVR4_ABIInfo::ELFv1; - bool IsSoftFloat = CodeGenOpts.FloatABI == "soft"; - - return SetCGInfo( ---- a/clang/lib/Driver/ToolChains/Clang.cpp -+++ b/clang/lib/Driver/ToolChains/Clang.cpp -@@ -1920,14 +1920,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args, - const llvm::Triple &T = getToolChain().getTriple(); - if (T.isOSBinFormatELF()) { - switch (getToolChain().getArch()) { -- case llvm::Triple::ppc64: { -- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) || -- T.isOSOpenBSD() || T.isMusl()) -- ABIName = "elfv2"; -- else -- ABIName = "elfv1"; -- break; -- } -+ case llvm::Triple::ppc64: - case llvm::Triple::ppc64le: - ABIName = "elfv2"; - break; diff --git a/srcpkgs/llvm12/patches/compiler-rt-aarch64-ucontext.patch b/srcpkgs/llvm12/patches/compiler-rt-aarch64-ucontext.patch deleted file mode 100644 index 893c059d7b8..00000000000 --- a/srcpkgs/llvm12/patches/compiler-rt-aarch64-ucontext.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp.orig -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -@@ -1799,7 +1799,7 @@ - - static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) { - static const u32 kEsrMagic = 0x45535201; -- u8 *aux = ucontext->uc_mcontext.__reserved; -+ u8 *aux = reinterpret_cast(ucontext->uc_mcontext.__reserved); - while (true) { - _aarch64_ctx *ctx = (_aarch64_ctx *)aux; - if (ctx->size == 0) break; diff --git a/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch b/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch deleted file mode 100644 index e5f24dab893..00000000000 --- a/srcpkgs/llvm12/patches/compiler-rt-sanitizer-glibc-2.36.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001 -From: Fangrui Song -Date: Mon, 11 Jul 2022 12:53:34 -0700 -Subject: [PATCH] [sanitizer] Remove #include to resolve - fsconfig_command/mount_attr conflict with glibc 2.36 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It is generally not a good idea to mix usage of glibc headers and Linux UAPI -headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc -since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h -defines `fsconfig_command` which conflicts with linux/mount.h: - - .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ - -Remove #include which pulls in linux/mount.h. Expand its 4 macros manually. -Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h. -In the long term we should move Linux specific definitions to sanitizer_platform_limits_linux.cpp -but this commit is easy to cherry pick into older compiler-rt releases. - -Fix https://github.com/llvm/llvm-project/issues/56421 - -Reviewed By: #sanitizers, vitalybuka, zatrazz - -Differential Revision: https://reviews.llvm.org/D129471 ---- - .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -index 4bd425435d56d..3a94b260686f1 100644 ---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -73,7 +73,9 @@ - #include - #include - #include -+#if SANITIZER_ANDROID - #include -+#endif - #include - #include - #include -@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; - unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; - #endif -- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; -- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; -- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; -- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; -+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); -+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); -+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); -+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); - unsigned IOCTL_GIO_CMAP = GIO_CMAP; - unsigned IOCTL_GIO_FONT = GIO_FONT; - unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; diff --git a/srcpkgs/llvm12/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm12/patches/compiler-rt-sanitizer-ppc64-musl.patch deleted file mode 100644 index 35f16d24f34..00000000000 --- a/srcpkgs/llvm12/patches/compiler-rt-sanitizer-ppc64-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -@@ -74,6 +74,10 @@ - #include - #endif - -+#if SANITIZER_LINUX && defined(__powerpc__) -+#include -+#endif -+ - #if SANITIZER_LINUX && !SANITIZER_ANDROID - #include - #endif ---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -92,7 +92,7 @@ - # include - # include - #if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \ -- SANITIZER_RISCV64 -+ defined(__powerpc__) || SANITIZER_RISCV64 - # include - # ifdef __arm__ - typedef struct user_fpregs elf_fpregset_t; ---- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp -+++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp -@@ -31,7 +31,7 @@ - #include // for pid_t - #include // for iovec - #include // for NT_PRSTATUS --#if (defined(__aarch64__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID -+#if (defined(__aarch64__) || defined(__powerpc__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID - // GLIBC 2.20+ sys/user does not include asm/ptrace.h - # include - #endif diff --git a/srcpkgs/llvm12/patches/compiler-rt-size_t.patch b/srcpkgs/llvm12/patches/compiler-rt-size_t.patch deleted file mode 100644 index 2c63063a5e9..00000000000 --- a/srcpkgs/llvm12/patches/compiler-rt-size_t.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp.orig -+++ b/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp -@@ -25,6 +25,7 @@ - } - - #include -+#include - #include - #include // for dlsym() - diff --git a/srcpkgs/llvm12/patches/compiler-rt-xray-ppc64-musl.patch b/srcpkgs/llvm12/patches/compiler-rt-xray-ppc64-musl.patch deleted file mode 100644 index d0b61c80c89..00000000000 --- a/srcpkgs/llvm12/patches/compiler-rt-xray-ppc64-musl.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/compiler-rt/lib/xray/xray_powerpc64.inc -+++ b/compiler-rt/lib/xray/xray_powerpc64.inc -@@ -12,7 +12,13 @@ - - #include - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#include -+#include -+#endif - - #include "xray_defs.h" - -@@ -20,13 +26,45 @@ namespace __xray { - - ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT { - CPU = 0; -+#ifdef __GLIBC__ - return __ppc_get_timebase(); -+#else -+ return __builtin_ppc_get_timebase(); -+#endif - } - - inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT { - static std::mutex M; - std::lock_guard Guard(M); -+#ifdef __GLIBC__ - return __ppc_get_timebase_freq(); -+#else -+ /* FIXME: a less dirty implementation? */ -+ static uint64_t base; -+ if (!base) { -+ FILE *f = fopen("/proc/cpuinfo", "rb"); -+ if (f) { -+ ssize_t nr; -+ /* virtually always big enough to hold the line */ -+ char buf[512]; -+ while (fgets(buf, sizeof(buf), f)) { -+ char *ret = strstr(buf, "timebase"); -+ if (!ret) { -+ continue; -+ } -+ ret += sizeof("timebase") - 1; -+ ret = strchr(ret, ':'); -+ if (!ret) { -+ continue; -+ } -+ base = strtoul(ret + 1, nullptr, 10); -+ break; -+ } -+ fclose(f); -+ } -+ } -+ return base; -+#endif - } - - inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT { diff --git a/srcpkgs/llvm12/patches/libcxx-musl.patch b/srcpkgs/llvm12/patches/libcxx-musl.patch deleted file mode 100644 index bbd31ffc2cb..00000000000 --- a/srcpkgs/llvm12/patches/libcxx-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libcxx/include/locale -+++ b/libcxx/include/locale -@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ long long __ll = strtoll(__a, &__p2, __base); -+#else - long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; -@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ unsigned long long __ll = strtoull(__a, &__p2, __base); -+#else - unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; diff --git a/srcpkgs/llvm12/patches/libcxx-ppc.patch b/srcpkgs/llvm12/patches/libcxx-ppc.patch deleted file mode 100644 index 7a92f8004e1..00000000000 --- a/srcpkgs/llvm12/patches/libcxx-ppc.patch +++ /dev/null @@ -1,22 +0,0 @@ -This ensures `is_iec559` is defined correctly under all long double ABIs, -including musl and its 64-bit long double. Also, `__ppc__` or `__ppc64__` -is not defined on gcc. - ---- a/libcxx/include/limits -+++ b/libcxx/include/limits -@@ -426,8 +426,14 @@ protected: - _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");} - _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;} - --#if (defined(__ppc__) || defined(__ppc64__)) -+#if defined(__powerpc__) || defined(__powerpc64__) -+#if (__LDBL_MAX_EXP__ > __DBL_MAX_EXP__) || (__LDBL_MANT_DIG__ == __DBL_MANT_DIG__) -+ /* IEEE 754 quadruple or double precision */ -+ static _LIBCPP_CONSTEXPR const bool is_iec559 = true; -+#else -+ /* 128-bit IBM double-double */ - static _LIBCPP_CONSTEXPR const bool is_iec559 = false; -+#endif - #else - static _LIBCPP_CONSTEXPR const bool is_iec559 = true; - #endif diff --git a/srcpkgs/llvm12/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm12/patches/libcxx-ssp-nonshared.patch deleted file mode 100644 index 70292beb2fc..00000000000 --- a/srcpkgs/llvm12/patches/libcxx-ssp-nonshared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libcxx/CMakeLists.txt -+++ b/libcxx/CMakeLists.txt -@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target) - target_link_libraries(${target} PRIVATE atomic) - endif() - -+#ssp target_link_libraries(${target} PRIVATE ssp_nonshared) -+ - if (MINGW) - target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}") - endif() diff --git a/srcpkgs/llvm12/patches/libcxxabi-dl.patch b/srcpkgs/llvm12/patches/libcxxabi-dl.patch deleted file mode 100644 index 3a15f9db8c9..00000000000 --- a/srcpkgs/llvm12/patches/libcxxabi-dl.patch +++ /dev/null @@ -1,25 +0,0 @@ -Also link to -ldl to prevent undefined references. - ---- a/libcxxabi/src/CMakeLists.txt -+++ b/libcxxabi/src/CMakeLists.txt -@@ -73,6 +73,7 @@ - endif() - - add_library_flags_if(LIBCXXABI_HAS_C_LIB c) -+ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl) - endif() - - if (LIBCXXABI_USE_LLVM_UNWINDER) ---- a/libcxx/CMakeLists.txt -+++ b/libcxx/CMakeLists.txt -@@ -745,6 +745,10 @@ - target_link_libraries(${target} PRIVATE m) - endif() - -+ if (LIBCXX_HAS_C_LIB) -+ target_link_libraries(${target} PRIVATE dl) -+ endif() -+ - if (LIBCXX_HAS_RT_LIB) - target_link_libraries(${target} PRIVATE rt) - endif() diff --git a/srcpkgs/llvm12/patches/libunwind-ppc32.patch b/srcpkgs/llvm12/patches/libunwind-ppc32.patch deleted file mode 100644 index 74aa7576ecf..00000000000 --- a/srcpkgs/llvm12/patches/libunwind-ppc32.patch +++ /dev/null @@ -1,63 +0,0 @@ -This fixes build at least with gcc9 which does not define `__ppc__`. - ---- a/libunwind/include/__libunwind_config.h -+++ b/libunwind/include/__libunwind_config.h -@@ -49,7 +49,7 @@ - # define _LIBUNWIND_CONTEXT_SIZE 167 - # define _LIBUNWIND_CURSOR_SIZE 179 - # define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64 --# elif defined(__ppc__) -+# elif defined(__powerpc__) - # define _LIBUNWIND_TARGET_PPC 1 - # define _LIBUNWIND_CONTEXT_SIZE 117 - # define _LIBUNWIND_CURSOR_SIZE 124 ---- a/libunwind/src/UnwindRegistersRestore.S -+++ b/libunwind/src/UnwindRegistersRestore.S -@@ -392,7 +392,7 @@ Lnovec: - PPC64_LR(3) - bctr - --#elif defined(__ppc__) -+#elif defined(__powerpc__) - - DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv) - // ---- a/libunwind/src/UnwindRegistersSave.S -+++ b/libunwind/src/UnwindRegistersSave.S -@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext) - blr - - --#elif defined(__ppc__) -+#elif defined(__powerpc__) - - // - // extern int unw_getcontext(unw_context_t* thread_state) ---- a/libunwind/src/config.h -+++ b/libunwind/src/config.h -@@ -95,12 +95,12 @@ - #define _LIBUNWIND_BUILD_SJLJ_APIS - #endif - --#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__powerpc64__) - #define _LIBUNWIND_SUPPORT_FRAME_APIS - #endif - - #if defined(__i386__) || defined(__x86_64__) || \ -- defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || \ -+ defined(__powerpc__) || defined(__powerpc64__) || \ - (!defined(__APPLE__) && defined(__arm__)) || \ - (defined(__arm64__) || defined(__aarch64__)) || \ - defined(__mips__) ---- a/libunwind/src/libunwind.cpp -+++ b/libunwind/src/libunwind.cpp -@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor, - # define REGISTER_KIND Registers_x86_64 - #elif defined(__powerpc64__) - # define REGISTER_KIND Registers_ppc64 --#elif defined(__ppc__) -+#elif defined(__powerpc__) - # define REGISTER_KIND Registers_ppc - #elif defined(__aarch64__) - # define REGISTER_KIND Registers_arm64 diff --git a/srcpkgs/llvm12/patches/lldb-musl.patch b/srcpkgs/llvm12/patches/lldb-musl.patch deleted file mode 100644 index 601c0d13852..00000000000 --- a/srcpkgs/llvm12/patches/lldb-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/lldb/source/Plugins/Process/Linux/Procfs.h -+++ b/lldb/source/Plugins/Process/Linux/Procfs.h -@@ -10,21 +10,12 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif diff --git a/srcpkgs/llvm12/patches/llvm-001-musl.patch b/srcpkgs/llvm12/patches/llvm-001-musl.patch deleted file mode 100644 index f2a3f8d6281..00000000000 --- a/srcpkgs/llvm12/patches/llvm-001-musl.patch +++ /dev/null @@ -1,57 +0,0 @@ -From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:03:02 +0200 -Subject: [PATCH 3/3] musl - ---- - include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ - lib/Support/DynamicLibrary.cpp | 2 +- - lib/Support/Unix/Signals.inc | 6 +++--- - utils/unittest/googletest/src/gtest.cc | 1 + - 5 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h -index 34a8a1e3..1214ece5 100644 ---- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h -+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h -@@ -18,6 +18,15 @@ - #include "llvm/IR/PassManager.h" - #include "llvm/Pass.h" - -+#undef fopen64 -+#undef fseeko64 -+#undef fstat64 -+#undef fstatvfs64 -+#undef ftello64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+ - namespace llvm { - template class ArrayRef; - class Triple; -diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/DynamicLibrary.inc -index a2a37996..2f86c470 100644 ---- a/llvm/lib/Support/Unix/DynamicLibrary.inc -+++ b/llvm/lib/Support/Unix/DynamicLibrary.inc -@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) { - - // This macro returns the address of a well-known, explicit symbol - #define EXPLICIT_SYMBOL(SYM) \ -- if (!strcmp(SymbolName, #SYM)) return &SYM -+ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM - - // Under glibc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we -diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc -index d882ab2e..f1fb12d0 100644 ---- a/llvm/utils/unittest/googletest/src/gtest.cc -+++ b/llvm/utils/unittest/googletest/src/gtest.cc -@@ -128,6 +128,7 @@ - - #if GTEST_CAN_STREAM_RESULTS_ - # include // NOLINT -+# include // NOLINT - # include // NOLINT - # include // NOLINT - # include // NOLINT diff --git a/srcpkgs/llvm12/patches/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm12/patches/llvm-002-musl-ppc64-elfv2.patch deleted file mode 100644 index 0071d964bd3..00000000000 --- a/srcpkgs/llvm12/patches/llvm-002-musl-ppc64-elfv2.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patches LLVM to use ELFv2 on ppc64 unconditionally unless overridden. We -need this because unlike most distros we use ELFv2 for both glibc and musl -on big endian ppc64. - -diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp -index 0634833e..b7cbc2e7 100644 ---- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp -+++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp -@@ -222,9 +222,8 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT, - - switch (TT.getArch()) { - case Triple::ppc64le: -- return PPCTargetMachine::PPC_ABI_ELFv2; - case Triple::ppc64: -- return PPCTargetMachine::PPC_ABI_ELFv1; -+ return PPCTargetMachine::PPC_ABI_ELFv2; - default: - return PPCTargetMachine::PPC_ABI_UNKNOWN; - } -diff --git a/test/CodeGen/PowerPC/ppc64-elf-abi.ll b/test/CodeGen/PowerPC/ppc64-elf-abi.ll -index 8b1cf6b5..296a2afa 100644 ---- a/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll -+++ b/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll -@@ -1,4 +1,5 @@ --; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1 -+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 -+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 diff --git a/srcpkgs/llvm12/patches/llvm-003-ppc-secureplt.patch b/srcpkgs/llvm12/patches/llvm-003-ppc-secureplt.patch deleted file mode 100644 index b5d15974375..00000000000 --- a/srcpkgs/llvm12/patches/llvm-003-ppc-secureplt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/llvm/lib/Target/PowerPC/PPCSubtarget.cpp -+++ b/llvm/lib/Target/PowerPC/PPCSubtarget.cpp -@@ -165,7 +165,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) { - - if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) || - TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() || -- TargetTriple.isMusl()) -+ isTargetLinux()) - SecurePlt = true; - - if (HasSPE && IsPPC64) diff --git a/srcpkgs/llvm12/patches/llvm-004-override-opt.patch b/srcpkgs/llvm12/patches/llvm-004-override-opt.patch deleted file mode 100644 index 51d0e4b31b3..00000000000 --- a/srcpkgs/llvm12/patches/llvm-004-override-opt.patch +++ /dev/null @@ -1,18 +0,0 @@ -This allows us to override the optimization level as not all platforms can -deal with -O3. - ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") - endif() - -+set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use") -+ -+if (NOT VOID_CXX_OPT_FLAGS STREQUAL "") -+ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}") -+endif() -+ - # Put this before tblgen. Else we have a circular dependence. - add_subdirectory(lib/Demangle) - add_subdirectory(lib/Support) diff --git a/srcpkgs/llvm12/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm12/patches/llvm-005-ppc-bigpic.patch deleted file mode 100644 index d332687b9d9..00000000000 --- a/srcpkgs/llvm12/patches/llvm-005-ppc-bigpic.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sun, 3 Nov 2019 10:57:27 -0600 -Subject: [PATCH] [LLVM][PowerPC] Assume BigPIC if no PIC level is specified - ---- - llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 2 +- - llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp -index cce21f32..87ca5f9b 100644 ---- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp -+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp -@@ -520,7 +520,7 @@ void PPCAsmPrinter::EmitTlsCall(const MachineInstr *MI, - - // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI. - if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt() && -- M->getPICLevel() == PICLevel::BigPIC) -+ M->getPICLevel() != PICLevel::SmallPIC) - TlsRef = MCBinaryExpr::createAdd( - TlsRef, MCConstantExpr::create(32768, OutContext), OutContext); - const MachineOperand &MO = MI->getOperand(2); -diff --git a/lib/Target/PowerPC/PPCMCInstLower.cpp b/lib/Target/PowerPC/PPCMCInstLower.cpp -index 5cc180d7..a5b02565 100644 ---- a/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp -+++ b/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp -@@ -117,7 +117,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol, - const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx); - // If -msecure-plt -fPIC, add 32768 to symbol. - if (Subtarget->isSecurePlt() && TM.isPositionIndependent() && -- M->getPICLevel() == PICLevel::BigPIC && -+ M->getPICLevel() != PICLevel::SmallPIC && - MO.getTargetFlags() == PPCII::MO_PLT) - Expr = - MCBinaryExpr::createAdd(Expr, MCConstantExpr::create(32768, Ctx), Ctx); diff --git a/srcpkgs/llvm12/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm12/patches/llvm-006-aarch64-mf_exec.patch deleted file mode 100644 index a00abd21666..00000000000 --- a/srcpkgs/llvm12/patches/llvm-006-aarch64-mf_exec.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: - - Failing Tests (8): - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3 - LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3 - -Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10 - ---- a/llvm/lib/Support/Unix/Memory.inc -+++ b/llvm/lib/Support/Unix/Memory.inc -@@ -58,7 +58,7 @@ static int getPosixProtectionFlags(unsigned Flags) { - return PROT_READ | PROT_WRITE | PROT_EXEC; - case llvm::sys::Memory::MF_EXEC: - #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \ -- defined(_POWER) || defined(_ARCH_PPC)) -+ defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__))) - // On PowerPC, having an executable page that has no read permission - // can have unintended consequences. The function InvalidateInstruction- - // Cache uses instructions dcbf and icbi, both of which are treated by diff --git a/srcpkgs/llvm12/patches/llvm-gcc13.patch b/srcpkgs/llvm12/patches/llvm-gcc13.patch deleted file mode 100644 index 6895221b73b..00000000000 --- a/srcpkgs/llvm12/patches/llvm-gcc13.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ff1681ddb303223973653f7f5f3f3435b48a1983 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 23 May 2022 08:03:23 +0100 -Subject: [PATCH] [Support] Add missing header to Signals.h - -Without the change llvm build fails on this week's gcc-13 snapshot as: - - [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o - In file included from llvm/lib/Support/Signals.cpp:14: - llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void - 119 | void CleanupOnSignal(uintptr_t Context); - | ^~~~~~~~~~~~~~~ ---- - llvm/include/llvm/Support/Signals.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/llvm/include/llvm/Support/Signals.h b/llvm/include/llvm/Support/Signals.h -index 44f5a750ff5cb0..937e0572d4a725 100644 ---- a/llvm/include/llvm/Support/Signals.h -+++ b/llvm/include/llvm/Support/Signals.h -@@ -14,6 +14,7 @@ - #ifndef LLVM_SUPPORT_SIGNALS_H - #define LLVM_SUPPORT_SIGNALS_H - -+#include - #include - - namespace llvm { diff --git a/srcpkgs/llvm12/patches/ppc32-compiler-rt.patch b/srcpkgs/llvm12/patches/ppc32-compiler-rt.patch deleted file mode 100644 index 8e0a9a779d1..00000000000 --- a/srcpkgs/llvm12/patches/ppc32-compiler-rt.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ba4ede595ff9599232f5dd2b4384c243137b53fc -Author: Daniel Kolesa -Date: Tue Jun 22 23:40:54 2021 +0200 - - enable compiler-rt support for ppc32 - -diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index 1edab43..5c0c8a2 100644 ---- a/compiler-rt/cmake/base-config-ix.cmake -+++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -182,9 +182,7 @@ macro(test_targets) - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le") - test_target_arch(powerpc64le "" "-m64") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc") -- if(CMAKE_SYSTEM_NAME MATCHES "AIX") -- test_target_arch(powerpc "" "-m32") -- endif() -+ test_target_arch(powerpc "" "-m32") - test_target_arch(powerpc64 "" "-m64") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "s390x") - test_target_arch(s390x "" "") diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template deleted file mode 100644 index 86e86bb96c6..00000000000 --- a/srcpkgs/llvm12/template +++ /dev/null @@ -1,161 +0,0 @@ -# Template file for 'llvm12' -pkgname=llvm12 -version=12.0.1 -revision=4 -build_wrksrc=llvm -build_style=cmake -configure_args=" - -DCMAKE_BUILD_TYPE=Release -Wno-dev - -DENABLE_LINKER_BUILD_ID=YES - -DLLDB_USE_SYSTEM_SIX=YES - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES - -DLIBCXXABI_USE_LLVM_UNWINDER=YES - -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES - -DLIBOMP_ENABLE_SHARED=YES - -DLIBOMP_INSTALL_ALIASES=NO - -DLLVM_INCLUDE_DOCS=YES - -DLLVM_BUILD_DOCS=YES - -DLLVM_ENABLE_SPHINX=YES - -DSPHINX_WARNINGS_AS_ERRORS=NO - -DLLVM_INSTALL_UTILS=YES - -DLLVM_BUILD_LLVM_DYLIB=YES - -DLLVM_LINK_LLVM_DYLIB=YES - -DLLVM_ENABLE_RTTI=YES - -DLLVM_ENABLE_FFI=YES - -DLLVM_BINUTILS_INCDIR=/usr/include" -hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx - python3-recommonmark python3-sphinx-automodapi" -makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel" -depends="libllvm12>=${version}_${revision}" -short_desc="Low Level Virtual Machine" -maintainer="Orphaned " -license="Apache-2.0" -homepage="https://www.llvm.org" -distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz" -checksum=129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e -lib32disabled=yes -python_version=3 - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" - makedepends+=" libexecinfo-devel" - depends+=" libexecinfo-devel" -fi - -# "operand out of range" assembler failures -case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;; -esac - -post_patch() { - # update config.guess for better platform detection - cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \ - ${wrksrc}/llvm/cmake - - # fix linker failures on some archs - vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \ - ${wrksrc}/libcxxabi/cmake/config-ix.cmake - vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \ - ${wrksrc}/libcxxabi/cmake/config-ix.cmake - - # need libssp_nonshared on some musl platforms (because of nodefaultlibs) - case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*-musl|i686-musl|mips*-musl) - vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ - ${wrksrc}/libunwind/src/CMakeLists.txt - vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ - ${wrksrc}/libcxxabi/src/CMakeLists.txt - vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt - ;; - esac - - case "$XBPS_TARGET_MACHINE" in - x86_64-musl) # some sanitizer currently only on x86_64 stuff needs backtrace - vsed -i 's,# Set common link flags.,list(APPEND SANITIZER_COMMON_LINK_LIBS execinfo),' \ - ${wrksrc}/compiler-rt/CMakeLists.txt - ;; - arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits - vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \ - ${wrksrc}/compiler-rt/cmake/config-ix.cmake - ;; - esac -} - -pre_configure() { - local triplet - - # Vastly reduce size of debugging symbols: - CFLAGS=${CFLAGS/ -g/ -g1} - CXXFLAGS=${CXXFLAGS/ -g/ -g1} - - # since gcc9, the build likes to blow up for ppc32 apparently because - # of clang being too large for a 24-bit relative call to the PLT, so - # optimize for size instead - case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - mips*-musl|ppc*) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;; - esac - - if [ "$CROSS_BUILD" ]; then - msg_normal "Building host tblgen\n" - mkdir -p build/HOST - cd build/HOST - CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \ - CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ - cmake ../.. -DCMAKE_BUILD_TYPE=Release - make ${makejobs} -C utils/TableGen - make ${makejobs} -C tools/clang/utils/TableGen - [ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen - configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen" - configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen" - cd ../.. - fi - - case "$XBPS_TARGET_MACHINE" in - i686*) _arch="X86";; - x86_64*) _arch="X86";; - armv5*) _arch="Armv5te";; - armv6*) _arch="Armv6";; - armv7*) _arch="Armv7";; - aarch64*) _arch="AArch64";; - mips*) _arch="Mips";; - ppc*) _arch="PowerPC";; - riscv64*) _arch="RISCV64";; - esac - - triplet=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET} - - configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" - configure_args+=" -DLLVM_HOST_TRIPLE=${triplet}" - configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${triplet}" -} - -do_install() { - cd build - cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake - - # Required for multilib. - if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - for _header in llvm-config; do - mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h - vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \ - usr/include/llvm/Config ${_header}.h - done - fi - - # Remove llvm-config-host in cross builds. - if [ "$CROSS_BUILD" ]; then - rm -f ${DESTDIR}/usr/bin/llvm-config-host - fi -} - -libllvm12_package() { - short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/libLLVM-*.so*" - } -} diff --git a/srcpkgs/llvm12/update b/srcpkgs/llvm12/update deleted file mode 100644 index e95cf26b358..00000000000 --- a/srcpkgs/llvm12/update +++ /dev/null @@ -1,3 +0,0 @@ -site="https://github.com/llvm/llvm-project/releases" -pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?" -ignore="*-rc*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e729b51bfc2..e2bf28e8cb2 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20240727 +version=0.1.20240729 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -376,6 +376,7 @@ replaces=" libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 libkscreen<=5.27.11_3 + libllvm12<=12.0.1_4 libllvm10<=10.0.0_8 libllvm11<=11.0.0_2 libllvm15<=15.0.7_4 @@ -440,6 +441,7 @@ replaces=" lldb-devel<=15.0.7_3 lldb15-devel<=15.0.7_4 lldb15<=15.0.7_4 + llvm12<=12.0.1_4 llvm10<=10.0.0_8 llvm11<=11.0.0_2 llvm15<=15.0.7_4