user/llvm: bump to 7.0.1

10 files changed, 0 insertions, 865 deletions

diff --git a/user/llvm6/APKBUILD b/user/llvm6/APKBUILD
deleted file mode 100644
index 5f7b04fad..000000000
--- a/user/llvm6/APKBUILD
+++ /dev/null
@@ -1,255 +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=6.0.1
-_majorver=${pkgver%%.*}
-pkgname=$_pkgname$_majorver
-pkgrel=0
-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="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz
-	llvm-fix-build-with-musl-libc.patch
-	cmake-fix-libLLVM-name.patch
-	disable-FileSystemTest.CreateDir-perms-assert.patch
-	disable-dlclose-test.patch
-	musl-ppc64-elfv2.patch
-	secure-plt.patch
-	more-secure-plt.patch
-	even-more-secure-plt.patch
-	ppc32-calling-convention.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="yes"
-
-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
-	cd "$builddir"
-
-	# https://bugs.llvm.org//show_bug.cgi?id=31870
-	rm test/tools/llvm-symbolizer/print_context.c
-
-	mkdir -p "$builddir"/build
-}
-
-build() {
-	cd "$builddir"/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='X86;ARM;AArch64;PowerPC;SystemZ;AMDGPU;NVPTX;Mips;BPF' \
-		"$builddir"
-
-	make llvm-tblgen
-	make
-
-	python3 ../utils/lit/setup.py build
-}
-
-check() {
-	cd "$builddir"/build
-
-	# FIXME: Few tests fail on s390x, ignore it for now. See build log
-	# https://gist.github.com/jirutka/6edc951ad5b8002cf1780546cf661edc
-	case "$CARCH" in
-		s390x) make check-llvm || true;;
-		*) make check-llvm;;
-	esac
-}
-
-package() {
-	cd "$builddir"/build
-
-	make DESTDIR="$pkgdir" 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
-
-	# Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/
-	# and symlink it back.
-	_mv lib/cmake/llvm/* "$pkgdir"/usr/lib/cmake/$pkgname/
-	rmdir lib/cmake/llvm
-	ln -s ../../../cmake/$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.0.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="cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9  llvm-6.0.1.src.tar.xz
-f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71  llvm-fix-build-with-musl-libc.patch
-6d1a716e5aa24e6b9a3acf4cc11e2504b1b01abf574074e9e5617b991de87d5e4e687eb18e85e73d5e632568afe2fc357771c4c96f9e136502071991496fb78c  cmake-fix-libLLVM-name.patch
-49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a  disable-FileSystemTest.CreateDir-perms-assert.patch
-caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200  disable-dlclose-test.patch
-e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e  musl-ppc64-elfv2.patch
-35d289641fa4d200b5a3f62f1d51da600a734641356b0dc6c54a3080dd89aec3b031e36af8b53be49c35346c1cbcce00268de7ec9b4f552bfd7bf84d3504d1c4  secure-plt.patch
-3d4a0a478bf800ea262c577451e22a1dbd5a4258226e49c66a697559263c8aa4fc0fff642a3c80ac3dfbb3efd6d9c0dbeb41dae1250fc7946de821cfef1ce1f0  more-secure-plt.patch
-deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7  even-more-secure-plt.patch
-c3f596a1578a07ce0ee40c4e2576fe05ca6ca0c1b4f94b1f74c55cb09603afe7c846db9294fe28d83ca48633086bad422218e6d06e0d92173143fb298e06fb38  ppc32-calling-convention.patch"
diff --git a/user/llvm6/cmake-fix-libLLVM-name.patch b/user/llvm6/cmake-fix-libLLVM-name.patch
deleted file mode 100644
index cb29fe2ef..000000000
--- a/user/llvm6/cmake-fix-libLLVM-name.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Include version in name of shared libs
-
-libLLVM.so -> libLLVM-$MAJOR.$MINOR.so
-
-Source: http://pkgs.fedoraproject.org/cgit/rpms/llvm3.9.git/tree/llvm-soversion.patch?id=3dac83eaa5b88f550ae50125b14b8f644e10617b
---- a/cmake/modules/AddLLVM.cmake
-+++ b/cmake/modules/AddLLVM.cmake
-@@ -450,6 +450,18 @@
-         PREFIX ""
-         )
-     endif()
-+
-+    # Set SOVERSION on shared libraries that lack explicit SONAME
-+    # specifier, on *nix systems that are not Darwin.
-+    if(UNIX AND NOT APPLE AND NOT ARG_SONAME)
-+      set_target_properties(${name}
-+        PROPERTIES
-+		# Concatenate the version numbers since ldconfig expects exactly
-+		# one component indicating the ABI version, while LLVM uses
-+		# major+minor for that.
-+        SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}
-+        VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
-+    endif()
-   endif()
- 
-   if(ARG_MODULE OR ARG_SHARED)
diff --git a/user/llvm6/disable-FileSystemTest.CreateDir-perms-assert.patch b/user/llvm6/disable-FileSystemTest.CreateDir-perms-assert.patch
deleted file mode 100644
index e73ce9b6f..000000000
--- a/user/llvm6/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/llvm6/disable-dlclose-test.patch b/user/llvm6/disable-dlclose-test.patch
deleted file mode 100644
index b70cd4d4d..000000000
--- a/user/llvm6/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/llvm6/even-more-secure-plt.patch b/user/llvm6/even-more-secure-plt.patch
deleted file mode 100644
index 112e111b8..000000000
--- a/user/llvm6/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/llvm6/llvm-fix-build-with-musl-libc.patch b/user/llvm6/llvm-fix-build-with-musl-libc.patch
deleted file mode 100644
index 6ee91ea44..000000000
--- a/user/llvm6/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/llvm6/more-secure-plt.patch b/user/llvm6/more-secure-plt.patch
deleted file mode 100644
index 1cc08a9a8..000000000
--- a/user/llvm6/more-secure-plt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/lib/Target/PowerPC/PPCSubtarget.cpp b/lib/Target/PowerPC/PPCSubtarget.cpp
-index c0cbfd779cb..5d7a021c3e2 100644
---- a/lib/Target/PowerPC/PPCSubtarget.cpp
-+++ b/lib/Target/PowerPC/PPCSubtarget.cpp
-@@ -106,6 +106,7 @@
-   HasFloat128 = false;
-   IsISA3_0 = false;
-   UseLongCalls = false;
-+  SecurePlt = false;
- 
-   HasPOPCNTD = POPCNTD_Unavailable;
- }
-@@ -136,6 +137,10 @@
-   if (isDarwin())
-     HasLazyResolverStubs = true;
- 
-+  // Set up musl-specific properties.
-+  if (TargetTriple.getEnvironment() == Triple::Musl)
-+    SecurePlt = true;
-+
-   // QPX requires a 32-byte aligned stack. Note that we need to do this if
-   // we're compiling for a BG/Q system regardless of whether or not QPX
-   // is enabled because external functions will assume this alignment.
-diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
-index c583fba8cab..6a9eedf89c5 100644
---- a/lib/Target/PowerPC/PPCTargetMachine.cpp
-+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
-@@ -222,6 +222,10 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT,
-   if (TT.getArch() == Triple::ppc64 || TT.getArch() == Triple::ppc64le)
-     return Reloc::PIC_;
- 
-+  // musl needs SecurePlt, which depends on PIC.
-+  if (TT.getEnvironment() == Triple::Musl)
-+    return Reloc::PIC_;
-+
-   // 32-bit is static by default.
-   return Reloc::Static;
- }
diff --git a/user/llvm6/musl-ppc64-elfv2.patch b/user/llvm6/musl-ppc64-elfv2.patch
deleted file mode 100644
index 016be5dad..000000000
--- a/user/llvm6/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/llvm6/ppc32-calling-convention.patch b/user/llvm6/ppc32-calling-convention.patch
deleted file mode 100644
index 2e6d66427..000000000
--- a/user/llvm6/ppc32-calling-convention.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-===================================================================
---- trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-+++ trunk/lib/Target/PowerPC/PPCISelLowering.cpp
-@@ -3511,9 +3511,14 @@
-       // Argument stored in memory.
-       assert(VA.isMemLoc());
- 
-+      // Get the extended size of the argument type in stack
-       unsigned ArgSize = VA.getLocVT().getStoreSize();
--      int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(),
--                                     isImmutable);
-+      // Get the actual size of the argument type
-+      unsigned ObjSize = VA.getValVT().getStoreSize();
-+      unsigned ArgOffset = VA.getLocMemOffset();
-+      // Stack objects in PPC32 are right justified.
-+      ArgOffset += ArgSize - ObjSize;
-+      int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable);
- 
-       // Create load nodes to retrieve arguments from the stack.
-       SDValue FIN = DAG.getFrameIndex(FI, PtrVT);
-@@ -5468,10 +5473,15 @@
-       Arg = PtrOff;
-     }
- 
--    if (VA.isRegLoc()) {
--      if (Arg.getValueType() == MVT::i1)
--        Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg);
-+    // When useCRBits() is true, there can be i1 arguments.
-+    // It is because getRegisterType(MVT::i1) => MVT::i1,
-+    // and for other integer types getRegisterType() => MVT::i32.
-+    // Extend i1 and ensure callee will get i32.
-+    if (Arg.getValueType() == MVT::i1)
-+      Arg = DAG.getNode(Flags.isSExt() ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND,
-+                        dl, MVT::i32, Arg);
- 
-+    if (VA.isRegLoc()) {
-       seenFloatArg |= VA.getLocVT().isFloatingPoint();
-       // Put argument in a physical register.
-       RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
-Index: trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-===================================================================
---- trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-+++ trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll
-@@ -0,0 +1,24 @@
-+; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s
-+target triple = "powerpc-unknown-linux-gnu"
-+
-+define void @check_callee(
-+  i32, i32, i32, i32,
-+  i32, i32, i32, i32,
-+  i1 zeroext %s1
-+) {
-+  call void @check_caller(
-+    i32 9, i32 9, i32 9, i32 9,
-+    i32 9, i32 9, i32 9, i32 9,
-+    i1 zeroext %s1)
-+  ret void
-+}
-+
-+; CHECK-LABEL: @check_callee
-+; CHECK: lbz {{[0-9]+}}, 27(1)
-+; CHECK: stw {{[0-9]+}}, 8(1)
-+
-+declare void @check_caller(
-+  i32, i32, i32, i32,
-+  i32, i32, i32, i32,
-+  i1 zeroext
-+)
diff --git a/user/llvm6/secure-plt.patch b/user/llvm6/secure-plt.patch
deleted file mode 100644
index e8af33d87..000000000
--- a/user/llvm6/secure-plt.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: llvm/lib/Target/PowerPC/PPC.td
-===================================================================
---- llvm/lib/Target/PowerPC/PPC.td
-+++ llvm/lib/Target/PowerPC/PPC.td
-@@ -119,6 +119,8 @@
-                               [FeatureBookE]>;
- def FeatureE500      : SubtargetFeature<"e500", "IsE500", "true",
-                                         "Enable E500/E500mc instructions">;
-+def FeatureSecurePlt : SubtargetFeature<"secure-plt","SecurePlt", "true",
-+                                        "Enable secure plt mode">;
- def FeaturePPC4xx    : SubtargetFeature<"ppc4xx", "IsPPC4xx", "true",
-                                         "Enable PPC 4xx instructions">;
- def FeaturePPC6xx    : SubtargetFeature<"ppc6xx", "IsPPC6xx", "true",
-Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-===================================================================
---- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-@@ -563,33 +563,63 @@
-     // Transform %rd = UpdateGBR(%rt, %ri)
-     // Into: lwz %rt, .L0$poff - .L0$pb(%ri)
-     //       add %rd, %rt, %ri
-+    // or into (if secure plt mode is on):
-+    //       addis r30, r30, .LTOC - .L0$pb@ha
-+    //       addi r30, r30, .LTOC - .L0$pb@l
-     // Get the offset from the GOT Base Register to the GOT
-     LowerPPCMachineInstrToMCInst(MI, TmpInst, *this, isDarwin);
--    MCSymbol *PICOffset =
--      MF->getInfo<PPCFunctionInfo>()->getPICOffsetSymbol();
--    TmpInst.setOpcode(PPC::LWZ);
--    const MCExpr *Exp =
--      MCSymbolRefExpr::create(PICOffset, MCSymbolRefExpr::VK_None, OutContext);
--    const MCExpr *PB =
--      MCSymbolRefExpr::create(MF->getPICBaseSymbol(),
--                              MCSymbolRefExpr::VK_None,
--                              OutContext);
--    const MCOperand TR = TmpInst.getOperand(1);
--    const MCOperand PICR = TmpInst.getOperand(0);
-+    if (Subtarget->isSecurePlt() && isPositionIndependent() ) {
-+      unsigned PICR = TmpInst.getOperand(0).getReg();
-+      MCSymbol *LTOCSymbol = OutContext.getOrCreateSymbol(StringRef(".LTOC"));
-+      const MCExpr *PB =
-+        MCSymbolRefExpr::create(MF->getPICBaseSymbol(),
-+                                OutContext);
- 
--    // Step 1: lwz %rt, .L$poff - .L$pb(%ri)
--    TmpInst.getOperand(1) =
--        MCOperand::createExpr(MCBinaryExpr::createSub(Exp, PB, OutContext));
--    TmpInst.getOperand(0) = TR;
--    TmpInst.getOperand(2) = PICR;
--    EmitToStreamer(*OutStreamer, TmpInst);
-+      const MCExpr *LTOCDeltaExpr =
-+        MCBinaryExpr::createSub(MCSymbolRefExpr::create(LTOCSymbol, OutContext),
-+                                PB, OutContext);
- 
--    TmpInst.setOpcode(PPC::ADD4);
--    TmpInst.getOperand(0) = PICR;
--    TmpInst.getOperand(1) = TR;
--    TmpInst.getOperand(2) = PICR;
--    EmitToStreamer(*OutStreamer, TmpInst);
--    return;
-+      const MCExpr *LTOCDeltaHi =
-+        PPCMCExpr::createHa(LTOCDeltaExpr, false, OutContext);
-+      EmitToStreamer(*OutStreamer, MCInstBuilder(PPC::ADDIS)
-+                                   .addReg(PICR)
-+                                   .addReg(PICR)
-+                                   .addExpr(LTOCDeltaHi));
-+
-+      const MCExpr *LTOCDeltaLo =
-+        PPCMCExpr::createLo(LTOCDeltaExpr, false, OutContext);
-+      EmitToStreamer(*OutStreamer, MCInstBuilder(PPC::ADDI)
-+                                   .addReg(PICR)
-+                                   .addReg(PICR)
-+                                   .addExpr(LTOCDeltaLo));
-+      return;
-+    } else {
-+      MCSymbol *PICOffset =
-+        MF->getInfo<PPCFunctionInfo>()->getPICOffsetSymbol();
-+      TmpInst.setOpcode(PPC::LWZ);
-+      const MCExpr *Exp =
-+        MCSymbolRefExpr::create(PICOffset, MCSymbolRefExpr::VK_None, OutContext);
-+      const MCExpr *PB =
-+        MCSymbolRefExpr::create(MF->getPICBaseSymbol(),
-+                                MCSymbolRefExpr::VK_None,
-+                                OutContext);
-+      const MCOperand TR = TmpInst.getOperand(1);
-+      const MCOperand PICR = TmpInst.getOperand(0);
-+
-+      // Step 1: lwz %rt, .L$poff - .L$pb(%ri)
-+      TmpInst.getOperand(1) =
-+          MCOperand::createExpr(MCBinaryExpr::createSub(Exp, PB, OutContext));
-+      TmpInst.getOperand(0) = TR;
-+      TmpInst.getOperand(2) = PICR;
-+      EmitToStreamer(*OutStreamer, TmpInst);
-+
-+      TmpInst.setOpcode(PPC::ADD4);
-+      TmpInst.getOperand(0) = PICR;
-+      TmpInst.getOperand(1) = TR;
-+      TmpInst.getOperand(2) = PICR;
-+      EmitToStreamer(*OutStreamer, TmpInst);
-+      return;
-+    }
-   }
-   case PPC::LWZtoc: {
-     // Transform %r3 = LWZtoc @min1, %r2
-@@ -1233,7 +1263,7 @@
- 
-   if (!Subtarget->isPPC64()) {
-     const PPCFunctionInfo *PPCFI = MF->getInfo<PPCFunctionInfo>();
--    if (PPCFI->usesPICBase()) {
-+    if (PPCFI->usesPICBase() && !Subtarget->isSecurePlt()) {
-       MCSymbol *RelocSymbol = PPCFI->getPICOffsetSymbol();
-       MCSymbol *PICBase = MF->getPICBaseSymbol();
-       OutStreamer->EmitLabel(RelocSymbol);
-Index: llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
-===================================================================
---- llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
-+++ llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
-@@ -4001,6 +4001,27 @@
-       return;
-     break;
- 
-+  case PPCISD::CALL: {
-+    const Module *M = MF->getFunction().getParent();
-+
-+    if (PPCLowering->getPointerTy(CurDAG->getDataLayout()) != MVT::i32 ||
-+        !PPCSubTarget->isSecurePlt() || !PPCSubTarget->isTargetELF() ||
-+        M->getPICLevel() == PICLevel::SmallPIC)
-+      break;
-+
-+    SDValue Op = N->getOperand(1);
-+
-+    if (GlobalAddressSDNode *GA = dyn_cast<GlobalAddressSDNode>(Op)) {
-+      if (GA->getTargetFlags() == PPCII::MO_PLT)
-+        getGlobalBaseReg();
-+    }
-+    else if (ExternalSymbolSDNode *ES = dyn_cast<ExternalSymbolSDNode>(Op)) {
-+      if (ES->getTargetFlags() == PPCII::MO_PLT)
-+        getGlobalBaseReg();
-+    }
-+  }
-+    break;
-+
-   case PPCISD::GlobalBaseReg:
-     ReplaceNode(N, getGlobalBaseReg());
-     return;
-Index: llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-===================================================================
---- llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-+++ llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-@@ -107,10 +107,20 @@
-       break;
-   }
- 
--  if (MO.getTargetFlags() == PPCII::MO_PLT)
-+ if (MO.getTargetFlags() == PPCII::MO_PLT)
-     RefKind = MCSymbolRefExpr::VK_PLT;
- 
-+  const MachineFunction *MF = MO.getParent()->getParent()->getParent();
-+  const PPCSubtarget *Subtarget = &(MF->getSubtarget<PPCSubtarget>());
-+  const TargetMachine &TM = Printer.TM;
-   const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx);
-+  // -msecure-plt option works only in PIC mode. If secure plt mode
-+  // is on add 32768 to symbol.
-+  if (Subtarget->isSecurePlt() && TM.isPositionIndependent() &&
-+      MO.getTargetFlags() == PPCII::MO_PLT)
-+    Expr = MCBinaryExpr::createAdd(Expr,
-+                                   MCConstantExpr::create(32768, Ctx),
-+                                   Ctx);
- 
-   if (!MO.isJTI() && MO.getOffset())
-     Expr = MCBinaryExpr::createAdd(Expr,
-Index: llvm/lib/Target/PowerPC/PPCSubtarget.h
-===================================================================
---- llvm/lib/Target/PowerPC/PPCSubtarget.h
-+++ llvm/lib/Target/PowerPC/PPCSubtarget.h
-@@ -133,6 +133,7 @@
-   bool HasFloat128;
-   bool IsISA3_0;
-   bool UseLongCalls;
-+  bool SecurePlt;
- 
-   POPCNTDKind HasPOPCNTD;
- 
-@@ -255,6 +256,7 @@
-   bool hasOnlyMSYNC() const { return HasOnlyMSYNC; }
-   bool isPPC4xx() const { return IsPPC4xx; }
-   bool isPPC6xx() const { return IsPPC6xx; }
-+  bool isSecurePlt() const {return SecurePlt; }
-   bool isE500() const { return IsE500; }
-   bool isFeatureMFTB() const { return FeatureMFTB; }
-   bool isDeprecatedDST() const { return DeprecatedDST; }
-Index: llvm/test/CodeGen/PowerPC/ppc32-pic-large.ll
-===================================================================
---- llvm/test/CodeGen/PowerPC/ppc32-pic-large.ll
-+++ llvm/test/CodeGen/PowerPC/ppc32-pic-large.ll
-@@ -1,4 +1,5 @@
- ; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -relocation-model=pic | FileCheck -check-prefix=LARGE-BSS %s
-+; RUN: llc < %s -mtriple=powerpc-unknown-linux-gnu -mattr=+secure-plt -relocation-model=pic | FileCheck -check-prefix=LARGE-SECUREPLT %s
- @bar = common global i32 0, align 4
- 
- declare i32 @call_foo(i32, ...)
-@@ -29,3 +30,6 @@
- ; LARGE-BSS:       [[VREF]]:
- ; LARGE-BSS-NEXT:     .p2align 2
- ; LARGE-BSS-NEXT:    .long bar
-+; LARGE-SECUREPLT:   addis 30, 30, .LTOC-.L0$pb@ha
-+; LARGE-SECUREPLT:   addi 30, 30, .LTOC-.L0$pb@l
-+; LARGE-SECUREPLT:   bl call_foo@PLT+32768