diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-22 01:36:05 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-22 03:14:38 -0600 |
commit | cd50a82701f113f26b14850cca88291e77f0a44b (patch) | |
tree | ef3682081a25f1359cdb40a6c0a399f6d61aa3c0 /user | |
parent | bdd71ef51bdd0b679a1384d3d8cce744ab2c9cc0 (diff) | |
download | packages-cd50a82701f113f26b14850cca88291e77f0a44b.tar.gz packages-cd50a82701f113f26b14850cca88291e77f0a44b.tar.bz2 packages-cd50a82701f113f26b14850cca88291e77f0a44b.tar.xz packages-cd50a82701f113f26b14850cca88291e77f0a44b.zip |
user/llvm8: Move to legacy/
We don't need LLVM 8 in-tree any more. The last dependent was Qt
Creator. LLVM 14 is the new hotness.
Closes: #460, #871
Diffstat (limited to 'user')
-rw-r--r-- | user/llvm8/APKBUILD | 241 | ||||
-rw-r--r-- | user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch | 61 | ||||
-rw-r--r-- | user/llvm8/disable-dlclose-test.patch | 18 | ||||
-rw-r--r-- | user/llvm8/even-more-secure-plt.patch | 101 | ||||
-rw-r--r-- | user/llvm8/fix-memory-mf_exec-on-aarch64.patch | 33 | ||||
-rw-r--r-- | user/llvm8/llvm-fix-build-with-musl-libc.patch | 46 | ||||
-rw-r--r-- | user/llvm8/more-secure-plt.patch | 145 | ||||
-rw-r--r-- | user/llvm8/musl-ppc64-elfv2.patch | 43 | ||||
-rw-r--r-- | user/llvm8/python3-test.patch | 8 | ||||
-rw-r--r-- | user/llvm8/scc-insertion.patch | 33 |
10 files changed, 0 insertions, 729 deletions
diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD deleted file mode 100644 index a7a2a44d3..000000000 --- a/user/llvm8/APKBUILD +++ /dev/null @@ -1,241 +0,0 @@ -# Contributor: Travis Tilley <ttilley@gmail.com> -# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com> -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -_pkgname=llvm -pkgver=8.0.1 -_majorver=${pkgver%%.*} -pkgname=$_pkgname$_majorver -pkgrel=3 -pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" -arch="all" -options="!checkroot !dbg" -url="https://llvm.org/" -license="NCSA" -depends_dev="$pkgname=$pkgver-r$pkgrel libexecinfo-dev libxml2-dev" -makedepends="binutils-dev chrpath cmake file libexecinfo-dev libffi-dev - libxml2-dev python3 zlib-dev" -subpackages="$pkgname-static $pkgname-libs $pkgname-dev - $pkgname-test-utils:_test_utils" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz - llvm-fix-build-with-musl-libc.patch - disable-FileSystemTest.CreateDir-perms-assert.patch - disable-dlclose-test.patch - musl-ppc64-elfv2.patch - more-secure-plt.patch - even-more-secure-plt.patch - python3-test.patch - scc-insertion.patch - fix-memory-mf_exec-on-aarch64.patch - " -builddir="$srcdir/$_pkgname-$pkgver.src" - -# ARM has few failures in test suite that we don't care about currently and -# also it takes forever to run them on the builder. -case "$CARCH" in - arm*) options="$options !check";; -esac - -# Whether is this package the default (latest) LLVM version. -_default_llvm="no" - -if [ "$_default_llvm" = yes ]; then - provides="llvm=$pkgver-r$pkgrel" - replaces="llvm" -fi - -# NOTE: It seems that there's no (sane) way how to change includedir, sharedir -# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and -# even LLVM-specific variables, that are related to these paths, actually -# don't work (in llvm 3.7). -# -# When building a software that depends on LLVM, utility llvm-config should be -# used to discover where is LLVM installed. It provides options to print -# path of bindir, includedir, and libdir separately, but in its source, all -# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it -# and move paths manually, but I'm really not sure what it may break... -# -# Also note that we should *not* add version suffix to files in llvm bindir! -# It breaks build system of some software that depends on LLVM, because they -# don't expect these files to have a sufix. -# -# So, we install all the LLVM files into /usr/lib/llvm$_majorver. -# BTW, Fedora and Debian do the same thing. -# -_prefix="usr/lib/llvm$_majorver" - -prepare() { - default_prepare - - # https://bugs.llvm.org//show_bug.cgi?id=31870 - rm test/tools/llvm-symbolizer/print_context.c -} - -build() { - # Auto-detect it by guessing either. - local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')" - - cmake -G "Unix Makefiles" -Wno-dev \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/$_prefix \ - -DCMAKE_VERBOSE_MAKEFILE=NO \ - -DFFI_INCLUDE_DIR="$ffi_include_dir" \ - -DLLVM_BINUTILS_INCDIR=/usr/include \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_BUILD_EXAMPLES=OFF \ - -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_BUILD_TESTS=ON \ - -DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \ - -DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_ENABLE_CXX1Y=ON \ - -DLLVM_ENABLE_FFI=ON \ - -DLLVM_ENABLE_LIBCXX=OFF \ - -DLLVM_ENABLE_PIC=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_ENABLE_TERMINFO=ON \ - -DLLVM_ENABLE_ZLIB=ON \ - -DLLVM_HOST_TRIPLE="$CHOST" \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;Sparc;SystemZ;WebAssembly;X86;XCore' \ - -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -Bbuild . - - make -C build llvm-tblgen - make -C build - - python3 utils/lit/setup.py build -} - -check() { - # appears to be an issue on musl and glibc, but only fails on musl: - # https://github.com/NixOS/nixpkgs/blob/bb7e9e46/pkgs/development/compilers/llvm/8/llvm.nix#L74 - rm -f "$builddir"/test/CodeGen/AArch64/wineh4.mir - make -C build check-llvm -} - -package() { - make DESTDIR="$pkgdir" -C build install - - cd "$pkgdir"/$_prefix - - # Remove RPATHs. - file lib/*.so bin/* \ - | awk -F: '$2~/ELF/{print $1}' \ - | xargs -r chrpath -d - - # Symlink files from /usr/lib/llvm*/bin to /usr/bin. - mkdir -p "$pkgdir"/usr/bin - local name newname path - for path in bin/*; do - name=${path##*/} - # Add version infix/suffix to the executable name. - case "$name" in - llvm-*) newname="llvm$_majorver-${name#llvm-}";; - *) newname="$name$_majorver";; - esac - # If this package provides=llvm (i.e. it's the default/latest - # llvm package), omit version infix/suffix. - if [ "$_default_llvm" = yes ]; then - newname=$name - fi - case "$name" in - FileCheck | obj2yaml | yaml2obj) continue;; - esac - ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname - done - - # Move /usr/lib/$pkgname/include/ into /usr/include/$pkgname/ - # and symlink it back. - _mv include/* "$pkgdir"/usr/include/$pkgname/ - rmdir include - ln -s ../../include/$pkgname include - - ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm -} - -static() { - pkgdesc="LLVM $_majorver static libraries" - _common_subpkg - - _mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/ - strip -d "$subpkgdir"/$_prefix/lib/*.a -} - -libs() { - pkgdesc="LLVM $_majorver runtime library" - local soname="libLLVM-$_majorver.so" - local soname2="libLLVM-$pkgver.so" - _common_subpkg - - mkdir -p "$subpkgdir" - cd "$subpkgdir" - - # libLLVM should be in /usr/lib. This is needed for binaries that are - # dynamically linked with libLLVM, so they can find it on default path. - _mv "$pkgdir"/$_prefix/lib/$soname usr/lib/ - ln -s $soname usr/lib/$soname2 - - # And also symlink it back to the LLVM prefix. - mkdir -p $_prefix/lib - ln -s ../../$soname $_prefix/lib/$soname - ln -s ../../$soname $_prefix/lib/$soname2 -} - -dev() { - _common_subpkg - default_dev - cd "$subpkgdir" - - _mv "$pkgdir"/$_prefix/lib $_prefix/ - _mv "$pkgdir"/$_prefix/include $_prefix/ - - _mv "$pkgdir"/$_prefix/bin/llvm-config $_prefix/bin/ -} - -_test_utils() { - pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites" - depends="python3" - _common_subpkg - replaces="" - - local litver="$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ - | sed 's/\.dev.*$//')" - test -n "$litver" || return 1 - provides="$provides lit=$litver-r$pkgrel" - - cd "$builddir"/build - - install -D -m 755 bin/FileCheck "$subpkgdir"/$_prefix/bin/FileCheck - install -D -m 755 bin/count "$subpkgdir"/$_prefix/bin/count - install -D -m 755 bin/not "$subpkgdir"/$_prefix/bin/not - - python3 ../utils/lit/setup.py install --prefix=/usr --root="$subpkgdir" - ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit -} - -_common_subpkg() { - if [ "$_default_llvm" = yes ]; then - replaces="llvm${subpkgname#$pkgname}" - provides="$replaces=$pkgver-r$pkgrel" - fi -} - -_mv() { - local dest; for dest; do true; done # get last argument - mkdir -p "$dest" - mv $@ -} - -sha512sums="82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 llvm-8.0.1.src.tar.xz -f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch -49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch -caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200 disable-dlclose-test.patch -e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch -7ba7f5b396e1afb49ea53fdc16729f0709fbba88de433cc8a8e2f751d13733011d4121318f68d7f8a16a6c57c3a1bee727cc3e0da0f5c6cae38eff70d3a539cf more-secure-plt.patch -deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch -53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch -4422a83ea953a6b30cb447a448d246956abd6b0cbd2451247e5f2c41318b2c0d18c7b6781155ea40a5558bbd66e9e1482cec0875d95776545fd0d87356b5e4bd scc-insertion.patch -c9ef3cd95c4bd1d6ac69bbcd471b01755126d00f59d27d4a2a2ef5623943be73f8407e2fd731294d1a9d81a66e459f45f3f1d5dc5f9646f4f2fb2d8d891b5279 fix-memory-mf_exec-on-aarch64.patch" diff --git a/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch b/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch deleted file mode 100644 index e73ce9b6f..000000000 --- a/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch +++ /dev/null @@ -1,61 +0,0 @@ -Do not assert permissions of file created in /tmp directory. - -This assertion fails, probably due to some specific setup of /tmp -on build servers. - - FAIL: LLVM-Unit :: Support/SupportTests/FileSystemTest.CreateDir (1293 of 17222) - ******************** TEST 'LLVM-Unit :: Support/SupportTests/FileSystemTest.CreateDir' FAILED ******************** - Note: Google Test filter = FileSystemTest.CreateDir - [==========] Running 1 test from 1 test case. - [----------] Global test environment set-up. - [----------] 1 test from FileSystemTest - [ RUN ] FileSystemTest.CreateDir - /home/buildozer/aports/testing/llvm3.9/src/llvm-3.9.1.src/unittests/Support/Path.cpp:591: Failure - Value of: fs::perms::owner_read | fs::perms::owner_exe - Actual: 320 - Expected: Status.permissions() & fs::perms::all_all - Which is: 448 - ---- a/unittests/Support/Path.cpp -+++ b/unittests/Support/Path.cpp -@@ -579,23 +579,23 @@ - ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo")); - - #ifdef LLVM_ON_UNIX -- // Set a 0000 umask so that we can test our directory permissions. -- mode_t OldUmask = ::umask(0000); -- -- fs::file_status Status; -- ASSERT_NO_ERROR( -- fs::create_directory(Twine(TestDirectory) + "baz500", false, -- fs::perms::owner_read | fs::perms::owner_exe)); -- ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz500", Status)); -- ASSERT_EQ(Status.permissions() & fs::perms::all_all, -- fs::perms::owner_read | fs::perms::owner_exe); -- ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "baz777", false, -- fs::perms::all_all)); -- ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz777", Status)); -- ASSERT_EQ(Status.permissions() & fs::perms::all_all, fs::perms::all_all); -- -- // Restore umask to be safe. -- ::umask(OldUmask); -+// // Set a 0000 umask so that we can test our directory permissions. -+// mode_t OldUmask = ::umask(0000); -+// -+// fs::file_status Status; -+// ASSERT_NO_ERROR( -+// fs::create_directory(Twine(TestDirectory) + "baz500", false, -+// fs::perms::owner_read | fs::perms::owner_exe)); -+// ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz500", Status)); -+// ASSERT_EQ(Status.permissions() & fs::perms::all_all, -+// fs::perms::owner_read | fs::perms::owner_exe); -+// ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "baz777", false, -+// fs::perms::all_all)); -+// ASSERT_NO_ERROR(fs::status(Twine(TestDirectory) + "baz777", Status)); -+// ASSERT_EQ(Status.permissions() & fs::perms::all_all, fs::perms::all_all); -+// -+// // Restore umask to be safe. -+// ::umask(OldUmask); - #endif - - #ifdef LLVM_ON_WIN32 diff --git a/user/llvm8/disable-dlclose-test.patch b/user/llvm8/disable-dlclose-test.patch deleted file mode 100644 index b70cd4d4d..000000000 --- a/user/llvm8/disable-dlclose-test.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- llvm-6.0.1.src/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp.old 2017-07-12 21:22:45.000000000 +0000 -+++ llvm-6.0.1.src/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp 2018-09-13 04:43:37.240000000 +0000 -@@ -107,6 +107,7 @@ - EXPECT_TRUE(DynamicLibrary::SearchOrder == DynamicLibrary::SO_Linker); - } - -+#if 0 - TEST(DynamicLibrary, Shutdown) { - std::string A("PipSqueak"), B, C("SecondLib"); - std::vector<std::string> Order; -@@ -162,6 +163,7 @@ - EXPECT_EQ(Order.front(), "SecondLib"); - EXPECT_EQ(Order.back(), "PipSqueak"); - } -+#endif - - #else - diff --git a/user/llvm8/even-more-secure-plt.patch b/user/llvm8/even-more-secure-plt.patch deleted file mode 100644 index 112e111b8..000000000 --- a/user/llvm8/even-more-secure-plt.patch +++ /dev/null @@ -1,101 +0,0 @@ -Index: lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp -=================================================================== ---- a/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp -+++ b/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp -@@ -442,13 +442,22 @@ - // On PPC64, VariantKind is VK_None, but on PPC32, it's VK_PLT, and it must - // come at the _end_ of the expression. - const MCOperand &Op = MI->getOperand(OpNo); -- const MCSymbolRefExpr &refExp = cast<MCSymbolRefExpr>(*Op.getExpr()); -- O << refExp.getSymbol().getName(); -+ const MCSymbolRefExpr *RefExp = nullptr; -+ const MCConstantExpr *ConstExp = nullptr; -+ if (const MCBinaryExpr *BinExpr = dyn_cast<MCBinaryExpr>(Op.getExpr())) { -+ RefExp = cast<MCSymbolRefExpr>(BinExpr->getLHS()); -+ ConstExp = cast<MCConstantExpr>(BinExpr->getRHS()); -+ } else -+ RefExp = cast<MCSymbolRefExpr>(Op.getExpr()); -+ -+ O << RefExp->getSymbol().getName(); - O << '('; - printOperand(MI, OpNo+1, O); - O << ')'; -- if (refExp.getKind() != MCSymbolRefExpr::VK_None) -- O << '@' << MCSymbolRefExpr::getVariantKindName(refExp.getKind()); -+ if (RefExp->getKind() != MCSymbolRefExpr::VK_None) -+ O << '@' << MCSymbolRefExpr::getVariantKindName(RefExp->getKind()); -+ if (ConstExp != nullptr) -+ O << '+' << ConstExp->getValue(); - } - - /// showRegistersWithPercentPrefix - Check if this register name should be -Index: lib/Target/PowerPC/PPCAsmPrinter.cpp -=================================================================== ---- a/lib/Target/PowerPC/PPCAsmPrinter.cpp -+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp -@@ -487,8 +487,14 @@ - if (!Subtarget->isPPC64() && !Subtarget->isDarwin() && - isPositionIndependent()) - Kind = MCSymbolRefExpr::VK_PLT; -- const MCSymbolRefExpr *TlsRef = -+ const MCExpr *TlsRef = - MCSymbolRefExpr::create(TlsGetAddr, Kind, OutContext); -+ -+ // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI. -+ if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt()) -+ TlsRef = MCBinaryExpr::createAdd(TlsRef, -+ MCConstantExpr::create(32768, OutContext), -+ OutContext); - const MachineOperand &MO = MI->getOperand(2); - const GlobalValue *GValue = MO.getGlobal(); - MCSymbol *MOSymbol = getSymbol(GValue); -Index: lib/Target/PowerPC/PPCISelDAGToDAG.cpp -=================================================================== ---- a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp -+++ b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp -@@ -4054,7 +4054,20 @@ - if (trySETCC(N)) - return; - break; -- -+ // These nodes will be transformed into GETtlsADDR32 node, which -+ // later becomes BL_TLS __tls_get_addr(sym at tlsgd)@PLT -+ case PPCISD::ADDI_TLSLD_L_ADDR: -+ case PPCISD::ADDI_TLSGD_L_ADDR: { -+ const Module *Mod = MF->getFunction().getParent(); -+ if (PPCLowering->getPointerTy(CurDAG->getDataLayout()) != MVT::i32 || -+ !PPCSubTarget->isSecurePlt() || !PPCSubTarget->isTargetELF() || -+ Mod->getPICLevel() == PICLevel::SmallPIC) -+ break; -+ // Attach global base pointer on GETtlsADDR32 node in order to -+ // generate secure plt code for TLS symbols. -+ getGlobalBaseReg(); -+ } -+ break; - case PPCISD::CALL: { - const Module *M = MF->getFunction().getParent(); - -Index: test/CodeGen/PowerPC/ppc32-secure-plt-tls.ll -=================================================================== ---- a/test/CodeGen/PowerPC/ppc32-secure-plt-tls.ll -+++ b/test/CodeGen/PowerPC/ppc32-secure-plt-tls.ll -@@ -0,0 +1,18 @@ -+; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -mattr=+secure-plt -relocation-model=pic | FileCheck -check-prefix=SECURE-PLT-TLS %s -+ -+@a = thread_local local_unnamed_addr global i32 6, align 4 -+define i32 @main() local_unnamed_addr #0 { -+entry: -+ %0 = load i32, i32* @a, align 4 -+ ret i32 %0 -+} -+ -+ -+!llvm.module.flags = !{!0} -+!0 = !{i32 7, !"PIC Level", i32 2} -+ -+; SECURE-PLT-TLS: mflr 30 -+; SECURE-PLT-TLS-NEXT: addis 30, 30, .LTOC-.L0$pb@ha -+; SECURE-PLT-TLS-NEXT: addi 30, 30, .LTOC-.L0$pb@l -+; SECURE-PLT-TLS-NEXT: bl .L{{.*}} -+; SECURE-PLT-TLS: bl __tls_get_addr(a@tlsgd)@PLT+32768 -\ No newline at end of file diff --git a/user/llvm8/fix-memory-mf_exec-on-aarch64.patch b/user/llvm8/fix-memory-mf_exec-on-aarch64.patch deleted file mode 100644 index a70b39733..000000000 --- a/user/llvm8/fix-memory-mf_exec-on-aarch64.patch +++ /dev/null @@ -1,33 +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/lib/Support/Unix/Memory.inc -+++ b/lib/Support/Unix/Memory.inc -@@ -54,7 +54,7 @@ - llvm::sys::Memory::MF_EXEC: - return PROT_READ | PROT_WRITE | PROT_EXEC; - case llvm::sys::Memory::MF_EXEC: --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || (defined(__linux__) && (defined(__aarch64__) || defined(__powerpc64__))) - // 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 -@@ -62,6 +62,7 @@ - // executing these instructions will result in a segmentation fault. - // Somehow, this problem is not present on Linux, but it does happen - // on FreeBSD. -+ // The same problem is present even on aarch64 Linux (at least on musl). - return PROT_READ | PROT_EXEC; - #else - return PROT_EXEC; diff --git a/user/llvm8/llvm-fix-build-with-musl-libc.patch b/user/llvm8/llvm-fix-build-with-musl-libc.patch deleted file mode 100644 index 6ee91ea44..000000000 --- a/user/llvm8/llvm-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5c571082fdaf61f6df19d9b7137dc26d71334058 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 18 Feb 2016 10:33:04 +0100 -Subject: [PATCH 2/3] Fix build with musl libc - -On musl libc the fopen64 and fopen are the same thing, but for -compatibility they have a `#define fopen64 fopen`. Same applies for -fseek64, fstat64, fstatvfs64, ftello64, lstat64, stat64 and tmpfile64. ---- - include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h -index 7becdf0..7f14427 100644 ---- a/include/llvm/Analysis/TargetLibraryInfo.h -+++ b/include/llvm/Analysis/TargetLibraryInfo.h -@@ -18,6 +18,26 @@ - #include "llvm/IR/Module.h" - #include "llvm/Pass.h" - -+#undef fopen64 -+#undef fseeko64 -+#undef fstat64 -+#undef fstatvfs64 -+#undef ftello64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+#undef F_GETLK64 -+#undef F_SETLK64 -+#undef F_SETLKW64 -+#undef flock64 -+#undef open64 -+#undef openat64 -+#undef creat64 -+#undef lockf64 -+#undef posix_fadvise64 -+#undef posix_fallocate64 -+#undef off64_t -+ - namespace llvm { - /// VecDesc - Describes a possible vectorization of a function. - /// Function 'VectorFnName' is equivalent to 'ScalarFnName' vectorized --- -2.7.3 - diff --git a/user/llvm8/more-secure-plt.patch b/user/llvm8/more-secure-plt.patch deleted file mode 100644 index 8b18a6db2..000000000 --- a/user/llvm8/more-secure-plt.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- llvm/lib/Target/PowerPC/PPCISelLowering.cpp -+++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp -@@ -2769,8 +2769,12 @@ SDValue PPCTargetLowering::LowerGlobalTLSAddress(SDValue Op, - SDValue GOTReg = DAG.getRegister(PPC::X2, MVT::i64); - GOTPtr = DAG.getNode(PPCISD::ADDIS_GOT_TPREL_HA, dl, - PtrVT, GOTReg, TGA); -- } else -- GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT); -+ } else { -+ if (isPositionIndependent()) -+ GOTPtr = DAG.getNode(PPCISD::PPC32_PICGOT, dl, PtrVT); -+ else -+ GOTPtr = DAG.getNode(PPCISD::PPC32_GOT, dl, PtrVT); -+ } - SDValue TPOffset = DAG.getNode(PPCISD::LD_GOT_TPREL_L, dl, - PtrVT, TGA, GOTPtr); - return DAG.getNode(PPCISD::ADD_TLS, dl, PtrVT, TPOffset, TGATLS); -@@ -4941,7 +4945,8 @@ PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag, SDValue &Chain, - if (auto *G = dyn_cast<GlobalAddressSDNode>(Callee)) - GV = G->getGlobal(); - bool Local = TM.shouldAssumeDSOLocal(*Mod, GV); -- bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64; -+ bool UsePlt = !Local && Subtarget.isTargetELF() && !isPPC64 && -+ TM.isPositionIndependent(); - - if (isFunctionGlobalAddress(Callee)) { - GlobalAddressSDNode *G = cast<GlobalAddressSDNode>(Callee); ---- llvm/lib/Target/PowerPC/PPCSubtarget.cpp -+++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp -@@ -138,7 +138,8 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) { - if (isDarwin()) - HasLazyResolverStubs = true; - -- if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD()) -+ if (TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() || -+ TargetTriple.isMusl()) - SecurePlt = true; - - if (HasSPE && IsPPC64) ---- llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll -+++ llvm/test/CodeGen/PowerPC/2008-10-28-f128-i32.ll -@@ -62,7 +62,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: lfd 4, 328(1) - ; CHECK-NEXT: fmr 1, 31 - ; CHECK-NEXT: fmr 2, 30 --; CHECK-NEXT: bl __gcc_qmul@PLT -+; CHECK-NEXT: bl __gcc_qmul - ; CHECK-NEXT: lis 3, 16864 - ; CHECK-NEXT: stfd 1, 280(1) - ; CHECK-NEXT: fmr 29, 1 -@@ -84,7 +84,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: lfd 4, 360(1) - ; CHECK-NEXT: lfd 1, 352(1) - ; CHECK-NEXT: lfd 2, 344(1) --; CHECK-NEXT: bl __gcc_qsub@PLT -+; CHECK-NEXT: bl __gcc_qsub - ; CHECK-NEXT: mffs 0 - ; CHECK-NEXT: mtfsb1 31 - ; CHECK-NEXT: lis 3, .LCPI0_1@ha -@@ -117,7 +117,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: .LBB0_5: # %bb1 - ; CHECK-NEXT: li 4, 0 - ; CHECK-NEXT: mr 3, 30 --; CHECK-NEXT: bl __floatditf@PLT -+; CHECK-NEXT: bl __floatditf - ; CHECK-NEXT: lis 3, 17392 - ; CHECK-NEXT: stfd 1, 208(1) - ; CHECK-NEXT: fmr 29, 1 -@@ -140,7 +140,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: lfd 4, 232(1) - ; CHECK-NEXT: lfd 1, 224(1) - ; CHECK-NEXT: lfd 2, 216(1) --; CHECK-NEXT: bl __gcc_qadd@PLT -+; CHECK-NEXT: bl __gcc_qadd - ; CHECK-NEXT: blt 2, .LBB0_7 - ; CHECK-NEXT: # %bb.6: # %bb1 - ; CHECK-NEXT: fmr 2, 28 -@@ -163,7 +163,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: stw 3, 248(1) - ; CHECK-NEXT: lfd 3, 256(1) - ; CHECK-NEXT: lfd 4, 248(1) --; CHECK-NEXT: bl __gcc_qsub@PLT -+; CHECK-NEXT: bl __gcc_qsub - ; CHECK-NEXT: stfd 2, 176(1) - ; CHECK-NEXT: fcmpu 0, 2, 27 - ; CHECK-NEXT: stfd 1, 168(1) -@@ -205,7 +205,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: lfd 4, 72(1) - ; CHECK-NEXT: lfd 1, 64(1) - ; CHECK-NEXT: lfd 2, 56(1) --; CHECK-NEXT: bl __gcc_qsub@PLT -+; CHECK-NEXT: bl __gcc_qsub - ; CHECK-NEXT: mffs 0 - ; CHECK-NEXT: mtfsb1 31 - ; CHECK-NEXT: lis 3, .LCPI0_2@ha -@@ -260,7 +260,7 @@ define i64 @__fixunstfdi(ppc_fp128 %a) nounwind readnone { - ; CHECK-NEXT: lfd 4, 136(1) - ; CHECK-NEXT: lfd 1, 128(1) - ; CHECK-NEXT: lfd 2, 120(1) --; CHECK-NEXT: bl __gcc_qsub@PLT -+; CHECK-NEXT: bl __gcc_qsub - ; CHECK-NEXT: mffs 0 - ; CHECK-NEXT: mtfsb1 31 - ; CHECK-NEXT: lis 3, .LCPI0_0@ha ---- llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll -+++ llvm/test/CodeGen/PowerPC/2010-02-12-saveCR.ll -@@ -11,7 +11,7 @@ entry: - ; CHECK-DAG: ori [[T2:[0-9]+]], [[T2]], 34492 - ; CHECK-DAG: stwx [[T1]], 1, [[T2]] - ; CHECK-DAG: addi 3, 1, 28 --; CHECK: bl bar@PLT -+; CHECK: bl bar - %x = alloca [100000 x i8] ; <[100000 x i8]*> [#uses=1] - %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0] - %x1 = bitcast [100000 x i8]* %x to i8* ; <i8*> [#uses=1] ---- llvm/test/CodeGen/PowerPC/available-externally.ll -+++ llvm/test/CodeGen/PowerPC/available-externally.ll -@@ -14,7 +14,7 @@ target triple = "powerpc-unknown-linux-gnu" - define i32 @foo(i64 %x) nounwind { - entry: - ; STATIC: foo: --; STATIC: bl exact_log2@PLT -+; STATIC: bl exact_log2 - ; STATIC: blr - - ; PIC: foo: ---- llvm/test/CodeGen/PowerPC/stubs.ll -+++ llvm/test/CodeGen/PowerPC/stubs.ll -@@ -6,4 +6,4 @@ entry: - } - - ; CHECK: test1: --; CHECK: bl __floatditf@PLT -+; CHECK: bl __floatditf ---- llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll -+++ llvm/test/CodeGen/PowerPC/umulo-128-legalisation-lowering.ll -@@ -72,7 +72,7 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) unnamed_addr #0 { - ; PPC32-NEXT: mr 28, 9 - ; PPC32-NEXT: mr 23, 6 - ; PPC32-NEXT: mr 24, 5 --; PPC32-NEXT: bl __multi3@PLT -+; PPC32-NEXT: bl __multi3 - ; PPC32-NEXT: mr 7, 4 - ; PPC32-NEXT: mullw 4, 24, 30 - ; PPC32-NEXT: mullw 8, 29, 23 diff --git a/user/llvm8/musl-ppc64-elfv2.patch b/user/llvm8/musl-ppc64-elfv2.patch deleted file mode 100644 index 016be5dad..000000000 --- a/user/llvm8/musl-ppc64-elfv2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 750d323a6060ad92c3d247f85d6555041f55b4a5 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 4 Oct 2018 15:26:59 -0500 -Subject: [PATCH] Add support for powerpc64-*-linux-musl targets - -This patch ensures that 64-bit PowerPC musl targets use ELFv2 ABI on both -endians. It additionally adds a test that big endian PPC64 uses ELFv2 on -musl. ---- - lib/Target/PowerPC/PPCTargetMachine.cpp | 4 ++++ - test/CodeGen/PowerPC/ppc64-elf-abi.ll | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp -index 34410393ef6..c583fba8cab 100644 ---- a/lib/Target/PowerPC/PPCTargetMachine.cpp -+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp -@@ -199,6 +199,10 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT, - case Triple::ppc64le: - return PPCTargetMachine::PPC_ABI_ELFv2; - case Triple::ppc64: -+ // musl uses ELFv2 ABI on both endians. -+ if (TT.getEnvironment() == Triple::Musl) -+ return PPCTargetMachine::PPC_ABI_ELFv2; -+ - return PPCTargetMachine::PPC_ABI_ELFv1; - 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 1e17930304b..aa594b37b47 100644 ---- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll -+++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll -@@ -1,6 +1,7 @@ - ; 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 -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=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 - ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 --- -2.18.0 - diff --git a/user/llvm8/python3-test.patch b/user/llvm8/python3-test.patch deleted file mode 100644 index 746313317..000000000 --- a/user/llvm8/python3-test.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py.old 2014-03-13 00:10:37.000000000 +0000 -+++ llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py 2019-03-10 03:48:48.600000000 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import sys - diff --git a/user/llvm8/scc-insertion.patch b/user/llvm8/scc-insertion.patch deleted file mode 100644 index b2d7d511a..000000000 --- a/user/llvm8/scc-insertion.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f7e9f4f4c50245d10ca9869a9f8f3d431dfb6948 Mon Sep 17 00:00:00 2001 -From: Warren Ristow <warren_ristow@playstation.sony.com> -Date: Tue, 14 Jan 2020 10:30:24 -0800 -Subject: [PATCH] SCC: Allow ReplaceNode to safely support insertion - -If scc_iterator::ReplaceNode is inserting a new entry in the map, -rather than replacing an existing entry, the possibility of growing -the map could cause a failure. This change safely implements the -insertion. - -Reviewed By: probinson - -Differential Revision: https://reviews.llvm.org/D72469 ---- - include/llvm/ADT/SCCIterator.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h -index eb1a5d0938cf..1e642b9f75d3 100644 ---- a/include/llvm/ADT/SCCIterator.h -+++ b/include/llvm/ADT/SCCIterator.h -@@ -134,7 +134,10 @@ class scc_iterator : public iterator_facade_base< - /// has been deleted, and \c New is to be used in its place. - void ReplaceNode(NodeRef Old, NodeRef New) { - assert(nodeVisitNumbers.count(Old) && "Old not in scc_iterator?"); -- nodeVisitNumbers[New] = nodeVisitNumbers[Old]; -+ // Do the assignment in two steps, in case 'New' is not yet in the map, and -+ // inserting it causes the map to grow. -+ auto tempVal = nodeVisitNumbers[Old]; -+ nodeVisitNumbers[New] = tempVal; - nodeVisitNumbers.erase(Old); - } - }; |