main/clang: upgrade to 3.8.0 and move out from llvm

8 files changed, 638 insertions, 0 deletions

diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
new file mode 100644
index 0000000000..a4909866ce
--- /dev/null
+++ b/main/clang/APKBUILD
@@ -0,0 +1,164 @@
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang
+pkgver=3.8.0
+pkgrel=0
+pkgdesc="A C language family front-end for LLVM"
+arch="all"
+url="http://llvm.org/"
+license="UOI-NCSA"
+depends=""
+depends_dev=""
+makedepends="$depends_dev
+	cmake
+	isl-dev
+	libxml2-dev
+	libxml2-utils
+	llvm-dev llvm llvm-static
+	make
+	paxmark
+	python
+	"
+install=
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-analyzer"
+source="
+	http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz
+
+	clang-0001-Add-Alpine-Linux-distro.patch
+	clang-0002-Use-z-relro-on-Alpine-Linux.patch
+	clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
+	clang-0004-Add-musl-targets-and-dynamic-linker.patch
+	clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
+	clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
+	clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch
+	"
+
+
+_builddir="$srcdir"/build
+#	-DLINK_POLLY_INTO_TOOLS=YES \
+#	-DPOLLY_ENABLE_GPGPU_CODEGEN=NO \
+#	-DWITH_POLLY=YES \
+
+
+_builddir="$srcdir"/build
+_srcdir="$srcdir"/cfe-$pkgver.src
+
+prepare() {
+	msg "Patching clang..."
+	cd "$_srcdir" || return 1
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
+
+build() {
+	mkdir -p "$_builddir"
+	cd "$_builddir"
+	cmake -G "Unix Makefiles" -Wno-dev \
+		-DCLANG_PLUGIN_SUPPORT=YES \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_VERBOSE_MAKEFILE=NO \
+		-DCLANG_INCLUDE_DOCS:BOOL=ON \
+		-DCLANG_INCLUDE_TESTS:BOOL=ON \
+		-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
+		"${_srcdir}" || return 1
+#		-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
+
+	make clang-tblgen || return 1
+	make || return 1
+
+	case "$CARCH" in
+	arm*)
+		# ARM has few failures in test suite
+		# that we don't care about currently
+		;;
+	*)
+		# needs lit.py from llvm source tree
+		# make check-clang	|| return 1
+		;;
+	esac
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || reeturn 1
+}
+
+static() {
+	pkgdesc="static libraries for clang"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+}
+
+#clang_libs() {
+#	pkgdesc="Runtime library for clang"
+#	mkdir -p "$subpkgdir"/usr/lib/
+#	mv "$pkgdir"/usr/lib/libclang*.so.* \
+#		"$pkgdir"/usr/lib/libclang*.so \
+#		"$subpkgdir"/usr/lib/
+#}
+
+clang() {
+	pkgdesc="A C language family front-end for LLVM"
+
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/share \
+		"$subpkgdir"/usr/include \
+		|| return 1
+	mv "$pkgdir"/usr/bin/*clang* \
+		"$pkgdir"/usr/bin/c-index-test \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/lib/clang \
+		"$pkgdir"/usr/lib/libclang* \
+		"$subpkgdir"/usr/lib/ || return 1
+	mv "$pkgdir"/usr/include/clang "$pkgdir"/usr/include/clang-c \
+		"$subpkgdir"/usr/include/ || return 1
+	mv "$pkgdir"/usr/share/clang "$subpkgdir"/usr/share/ || return 1
+}
+
+analyzer() {
+	pkgdesc="clang source code analysis framework"
+	depends="python"
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/libexec \
+		"$subpkgdir"/usr/share/ \
+		|| return 1
+	mv "$pkgdir"/usr/bin/scan-* \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/libexec/*-analyzer \
+		"$subpkgdir"/usr/libexec/ || return 1
+	mv "$pkgdir"/usr/share/scan-* \
+		"$subpkgdir"/usr/share/ || return 1
+}
+
+md5sums="cc99e7019bb74e6459e80863606250c5  cfe-3.8.0.src.tar.xz
+4f1454992cf8aab70ac5eff62e6ea883  clang-0001-Add-Alpine-Linux-distro.patch
+4c6531bed2dbfa945b761aa371e86b9a  clang-0002-Use-z-relro-on-Alpine-Linux.patch
+8e866582b4ee7f7d282e49ab43d2b511  clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
+31084621d11fe722acc41d4e0d7e340f  clang-0004-Add-musl-targets-and-dynamic-linker.patch
+636b294bc8af983f1fd5084df48dad00  clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
+227884842639a3862aff22d9a7af1740  clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
+6daf6d90da9561818098922101af09f4  clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch"
+sha256sums="04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9  cfe-3.8.0.src.tar.xz
+d2c0666ecf8640ff85ea418ed8c0286b112962139a5ad5644019e69b1214a3dd  clang-0001-Add-Alpine-Linux-distro.patch
+3f7f3c7d185420707dc7572603b963ca5ec5a0425d1f7f53473948d9fb7f149b  clang-0002-Use-z-relro-on-Alpine-Linux.patch
+5bb41e118184aee03ef3dec47d2ada38516040f903c630283617399db21dc27e  clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
+15d9a0c6422b426f790e496fe43223d0f36cf7dbe32d30272a1208616245db4c  clang-0004-Add-musl-targets-and-dynamic-linker.patch
+3603e6008dfc63cea1da6ee82a624710ba82683347207b4f39f2fcb5e67c43c9  clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
+8b5f95c981379967972db9a3b607b05687ce0c5e0067f6cc1ea52fde6f5a3005  clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
+ffeb06bc8042f8715a3413a7556a113645835a7bc6332f725ce1b7b952846930  clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch"
+sha512sums="fef431d63f95a394d53e3857fb6a6bde7a7b27f40ef5111b4353bcb63ac26febec8a9eb84780187c49699ab099834f13f996f085d02c365676b3fa5bbcc03dcd  cfe-3.8.0.src.tar.xz
+ed19cb50fe96a5b05754887b055d75f0c0466f77e07e4d4f69b9cea17a3fa88e449d54bd47a791780bee095716cf6b6d8bf16352317192b0ce88d09c603af657  clang-0001-Add-Alpine-Linux-distro.patch
+22ad0e449c633f3d5a849207c5e2ed048998e03820c743ad90242d4637c23ba3d2dc8f3c51b923fdfa1891d08d10e934f65dd7b6a90adeb3ce35c3ab923370d3  clang-0002-Use-z-relro-on-Alpine-Linux.patch
+c6c1f8693085c375f7039baa64f209834f8fdb8be4c597301e882b3fe099bb91e427beaf6555664e46a4e0aae7dbb4b6e0662a1390c4eaacfdbb138345feb478  clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
+29e92198d164572ac32d43da40c5d01070d45073cbda2338ff1e3949f6807db722ca9d40a4ef03b21de7e9e9d7b0a61e273b760cf8f302d3ec77d1b0027accc2  clang-0004-Add-musl-targets-and-dynamic-linker.patch
+c38f973d9ad8f3e535476cf2b617a2a569a15db8e28c2df0d70252cf69ccbdb29ab18d3aa979b4e66d52128ad0fa654fd0ae503e0cd14b0c265addff1ee35268  clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
+af79bb12a75866151edb257377dc5c5f47fa69b03c860ffd0d5d569f18385d642a1cf394c1d375f0fa0a2226637b000bb15f9bf3cacd95972bd465dd8fdbed0c  clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
+a2a9b307d764fed977299b1b9d130d63a60e65889638b1aadcc082ef021170c8c0c38b4107ceef7b85b057ef2a72bc19a84297f5179afaf697983c19b20cab7b  clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch"
diff --git a/main/clang/clang-0001-Add-Alpine-Linux-distro.patch b/main/clang/clang-0001-Add-Alpine-Linux-distro.patch
new file mode 100644
index 0000000000..6cbed09d53
--- /dev/null
+++ b/main/clang/clang-0001-Add-Alpine-Linux-distro.patch
@@ -0,0 +1,34 @@
+From 4559c66aabd8b56f7127c8b1f5d22f59d3ca2390 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 18 Feb 2016 17:40:00 +0100
+Subject: [PATCH 1/7] Add Alpine Linux distro
+
+---
+ lib/Driver/ToolChains.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 99c7b8e..70b53bd 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -3374,6 +3374,7 @@ enum Distro {
+   // NB: Releases of a particular Linux distro should be kept together
+   // in this enum, because some tests are done by integer comparison against
+   // the first and last known member in the family, e.g. IsRedHat().
++  AlpineLinux,
+   ArchLinux,
+   DebianLenny,
+   DebianSqueeze,
+@@ -3497,6 +3498,9 @@ static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) {
+   if (D.getVFS().exists("/etc/arch-release"))
+     return ArchLinux;
+ 
++  if (D.getVFS().exists("/etc/alpine-release"))
++    return AlpineLinux;
++
+   return UnknownDistro;
+ }
+ 
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch b/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch
new file mode 100644
index 0000000000..090ec3d509
--- /dev/null
+++ b/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch
@@ -0,0 +1,25 @@
+From 1898d32d22fddf3ba6c88addbd2af0159600b506 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 18 Feb 2016 17:41:23 +0100
+Subject: [PATCH 2/7] Use "-z relro" on Alpine Linux
+
+---
+ lib/Driver/ToolChains.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 70b53bd..46326f0 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -3667,7 +3667,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+ 
+   Distro Distro = DetectDistro(D, Arch);
+ 
+-  if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
++  if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) {
+     ExtraOpts.push_back("-z");
+     ExtraOpts.push_back("relro");
+   }
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch b/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
new file mode 100644
index 0000000000..4dc9842f00
--- /dev/null
+++ b/main/clang/clang-0003-Use-hash-style-gnu-for-Alpine-Linux.patch
@@ -0,0 +1,27 @@
+From b880ea7037ea3232be9ba2e96cc179da92ea4b9c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 18 Feb 2016 17:43:51 +0100
+Subject: [PATCH 3/7] Use --hash-style=gnu for Alpine Linux
+
+---
+ lib/Driver/ToolChains.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 46326f0..6b0b31d 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -3687,8 +3687,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+   // ABI requires a mapping between the GOT and the symbol table.
+   // Android loader does not support .gnu.hash.
+   if (!IsMips && !IsAndroid) {
+-    if (IsRedhat(Distro) || IsOpenSUSE(Distro) ||
+-        (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
++    if (IsRedhat(Distro) || IsOpenSUSE(Distro) || Distro == AlpineLinux ||
++       (IsUbuntu(Distro) && Distro >= UbuntuMaverick))
+       ExtraOpts.push_back("--hash-style=gnu");
+ 
+     if (IsDebian(Distro) || IsOpenSUSE(Distro) || Distro == UbuntuLucid ||
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0004-Add-musl-targets-and-dynamic-linker.patch b/main/clang/clang-0004-Add-musl-targets-and-dynamic-linker.patch
new file mode 100644
index 0000000000..6384b088f6
--- /dev/null
+++ b/main/clang/clang-0004-Add-musl-targets-and-dynamic-linker.patch
@@ -0,0 +1,222 @@
+From 4777c16fc6e717a852366fa2a447c852cca3b62d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 19 Feb 2016 13:35:08 +0100
+Subject: [PATCH 4/7] Add musl targets and dynamic linker
+
+---
+ lib/Basic/Targets.cpp      |  2 ++
+ lib/CodeGen/TargetInfo.cpp |  6 +++++-
+ lib/Driver/ToolChains.cpp  | 15 ++++++++++-----
+ lib/Driver/Tools.cpp       | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 60 insertions(+), 7 deletions(-)
+
+diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
+index af8aea0..1e27c7a 100644
+--- a/lib/Basic/Targets.cpp
++++ b/lib/Basic/Targets.cpp
+@@ -4513,6 +4513,8 @@ public:
+       case llvm::Triple::Android:
+       case llvm::Triple::GNUEABI:
+       case llvm::Triple::GNUEABIHF:
++      case llvm::Triple::MuslEABI:
++      case llvm::Triple::MuslEABIHF:
+         setABI("aapcs-linux");
+         break;
+       case llvm::Triple::EABIHF:
+diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
+index 3d1ddef..f6b3474 100644
+--- a/lib/CodeGen/TargetInfo.cpp
++++ b/lib/CodeGen/TargetInfo.cpp
+@@ -4757,6 +4757,8 @@ public:
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABI:
+     case llvm::Triple::GNUEABIHF:
++    case llvm::Triple::MuslEABI:
++    case llvm::Triple::MuslEABIHF:
+       return true;
+     default:
+       return false;
+@@ -4767,6 +4769,7 @@ public:
+     switch (getTarget().getTriple().getEnvironment()) {
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
++    case llvm::Triple::MuslEABIHF:
+       return true;
+     default:
+       return false;
+@@ -7492,7 +7495,8 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
+         Kind = ARMABIInfo::AAPCS16_VFP;
+       else if (CodeGenOpts.FloatABI == "hard" ||
+                (CodeGenOpts.FloatABI != "soft" &&
+-                Triple.getEnvironment() == llvm::Triple::GNUEABIHF))
++                (Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
++                 Triple.getEnvironment() == llvm::Triple::MuslEABIHF)))
+         Kind = ARMABIInfo::AAPCS_VFP;
+ 
+       return *(TheTargetCodeGenInfo = new ARMTargetCodeGenInfo(Types, Kind));
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 6b0b31d..0db9644 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -1523,7 +1523,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
+   case llvm::Triple::arm:
+   case llvm::Triple::thumb:
+     LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
+-    if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
++    if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
++        TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
+       TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));
+     } else {
+       TripleAliases.append(begin(ARMTriples), end(ARMTriples));
+@@ -1532,7 +1533,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
+   case llvm::Triple::armeb:
+   case llvm::Triple::thumbeb:
+     LibDirs.append(begin(ARMebLibDirs), end(ARMebLibDirs));
+-    if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
++    if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
++        TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
+       TripleAliases.append(begin(ARMebHFTriples), end(ARMebHFTriples));
+     } else {
+       TripleAliases.append(begin(ARMebTriples), end(ARMebTriples));
+@@ -3528,7 +3530,8 @@ static std::string getMultiarchTriple(const Driver &D,
+   // regardless of what the actual target triple is.
+   case llvm::Triple::arm:
+   case llvm::Triple::thumb:
+-    if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
++    if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
++        TargetEnvironment == llvm::Triple::MuslEABIHF) {
+       if (D.getVFS().exists(SysRoot + "/lib/arm-linux-gnueabihf"))
+         return "arm-linux-gnueabihf";
+     } else {
+@@ -3538,7 +3541,8 @@ static std::string getMultiarchTriple(const Driver &D,
+     break;
+   case llvm::Triple::armeb:
+   case llvm::Triple::thumbeb:
+-    if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
++    if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
++        TargetEnvironment == llvm::Triple::MuslEABIHF) {
+       if (D.getVFS().exists(SysRoot + "/lib/armeb-linux-gnueabihf"))
+         return "armeb-linux-gnueabihf";
+     } else {
+@@ -3969,7 +3973,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+     break;
+   case llvm::Triple::arm:
+   case llvm::Triple::thumb:
+-    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
++    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF ||
++        getTriple().getEnvironment() == llvm::Triple::MuslEABIHF)
+       MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
+     else
+       MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
+diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
+index b7ac24f..ea1ce6f 100644
+--- a/lib/Driver/Tools.cpp
++++ b/lib/Driver/Tools.cpp
+@@ -712,6 +712,7 @@ arm::FloatABI arm::getARMFloatABI(const ToolChain &TC, const ArgList &Args) {
+     case llvm::Triple::FreeBSD:
+       switch (Triple.getEnvironment()) {
+       case llvm::Triple::GNUEABIHF:
++      case llvm::Triple::MuslEABIHF:
+         ABI = FloatABI::Hard;
+         break;
+       default:
+@@ -725,6 +726,7 @@ arm::FloatABI arm::getARMFloatABI(const ToolChain &TC, const ArgList &Args) {
+       switch (Triple.getEnvironment()) {
+       case llvm::Triple::GNUEABIHF:
+       case llvm::Triple::EABIHF:
++      case llvm::Triple::MuslEABIHF:
+         ABI = FloatABI::Hard;
+         break;
+       case llvm::Triple::GNUEABI:
+@@ -968,6 +970,8 @@ void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args,
+     case llvm::Triple::Android:
+     case llvm::Triple::GNUEABI:
+     case llvm::Triple::GNUEABIHF:
++    case llvm::Triple::MuslEABI:
++    case llvm::Triple::MuslEABIHF:
+       ABIName = "aapcs-linux";
+       break;
+     case llvm::Triple::EABIHF:
+@@ -7857,6 +7861,8 @@ void freebsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
+     switch (getToolChain().getTriple().getEnvironment()) {
+     case llvm::Triple::GNUEABIHF:
+     case llvm::Triple::GNUEABI:
++    case llvm::Triple::MuslEABIHF:
++    case llvm::Triple::MuslEABI:
+     case llvm::Triple::EABI:
+       CmdArgs.push_back("-meabi=5");
+       break;
+@@ -8199,10 +8205,12 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+     switch (getToolChain().getTriple().getEnvironment()) {
+     case llvm::Triple::EABI:
+     case llvm::Triple::GNUEABI:
++    case llvm::Triple::MuslEABI:
+       CmdArgs.push_back("armelf_nbsd_eabi");
+       break;
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
++    case llvm::Triple::MuslEABIHF:
+       CmdArgs.push_back("armelf_nbsd_eabihf");
+       break;
+     default:
+@@ -8219,10 +8227,12 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+     switch (getToolChain().getTriple().getEnvironment()) {
+     case llvm::Triple::EABI:
+     case llvm::Triple::GNUEABI:
++    case llvm::Triple::MuslEABI:
+       CmdArgs.push_back("armelfb_nbsd_eabi");
+       break;
+     case llvm::Triple::EABIHF:
+     case llvm::Triple::GNUEABIHF:
++    case llvm::Triple::MuslEABIHF:
+       CmdArgs.push_back("armelfb_nbsd_eabihf");
+       break;
+     default:
+@@ -8623,11 +8633,43 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
+     CmdArgs.push_back("-ldl");
+ }
+ 
++static std::string getMuslDynamicLinker(const llvm::Triple::ArchType Arch,
++                                        const llvm::Triple::EnvironmentType Env) {
++  switch (Arch) {
++  case llvm::Triple::arm:
++  case llvm::Triple::thumb:
++    return Env == llvm::Triple::MuslEABIHF ?
++           "/lib/ld-musl-armhf.so.1" : "/lib/ld-musl-arm.so.1";
++  case llvm::Triple::armeb:
++  case llvm::Triple::thumbeb:
++    return Env == llvm::Triple::MuslEABIHF ?
++           "/lib/ld-musl-armebhf.so.1" : "/lib/ld-musl-armeb.so.1";
++  case llvm::Triple::aarch64:
++    return "/lib/ld-musl-aarch64.so.1";
++  case llvm::Triple::aarch64_be:
++    return "/lib/ld-musl-aarch64_be.so.1";
++  case llvm::Triple::mips:
++    return "/lib/ld-musl-mips.so.1";
++  case llvm::Triple::mipsel:
++    return "/lib/ld-musl-mipsel.so.1";
++  case llvm::Triple::ppc:
++    return "/lib/ld-musl-powerpc.so.1";
++  case llvm::Triple::x86:
++    return "/lib/ld-musl-i386.so.1";
++//case llvm::Triple::x86_64:
++  default:
++    return "/lib/ld-musl-x86_64.so.1";
++  }
++  return NULL;
++}
++
+ static std::string getLinuxDynamicLinker(const ArgList &Args,
+                                          const toolchains::Linux &ToolChain) {
+   const llvm::Triple::ArchType Arch = ToolChain.getArch();
+ 
+-  if (ToolChain.getTriple().isAndroid()) {
++  if (ToolChain.getTriple().isMusl()) {
++    return getMuslDynamicLinker(Arch, ToolChain.getTriple().getEnvironment());
++  } else if (ToolChain.getTriple().isAndroid()) {
+     if (ToolChain.getTriple().isArch64Bit())
+       return "/system/bin/linker64";
+     else
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch b/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
new file mode 100644
index 0000000000..a1d49eeb82
--- /dev/null
+++ b/main/clang/clang-0005-Enable-PIE-by-default-for-alpine-linux.patch
@@ -0,0 +1,69 @@
+From efbdf70c883a356106fc1bcb1c2917ec6c0a6157 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 23 Feb 2016 09:35:26 +0100
+Subject: [PATCH 5/7] Enable PIE by default for alpine linux
+
+Alpine Linux uses PIE by default.
+---
+ lib/Driver/ToolChains.cpp |  5 ++++-
+ lib/Driver/Tools.cpp      |  4 +++-
+ test/Driver/pic.c         | 12 ++++++++++++
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 0db9644..82449bf 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -4143,7 +4143,10 @@ void Linux::AddCudaIncludeArgs(const ArgList &DriverArgs,
+   }
+ }
+ 
+-bool Linux::isPIEDefault() const { return getSanitizerArgs().requiresPIE(); }
++bool Linux::isPIEDefault() const {
++  return getSanitizerArgs().requiresPIE() ||
++         Linux::getTriple().getVendorName().compare("alpine") == 0;
++}
+ 
+ SanitizerMask Linux::getSupportedSanitizers() const {
+   const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
+diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
+index ea1ce6f..8fd3649 100644
+--- a/lib/Driver/Tools.cpp
++++ b/lib/Driver/Tools.cpp
+@@ -7919,7 +7919,9 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (!D.SysRoot.empty())
+     CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
+ 
+-  if (IsPIE)
++  if (Args.hasArg(options::OPT_nopie))
++    CmdArgs.push_back("-nopie");
++  else if (IsPIE)
+     CmdArgs.push_back("-pie");
+ 
+   if (Args.hasArg(options::OPT_static)) {
+diff --git a/test/Driver/pic.c b/test/Driver/pic.c
+index aeb2ee3..9b8e0f6 100644
+--- a/test/Driver/pic.c
++++ b/test/Driver/pic.c
+@@ -243,6 +243,18 @@
+ // RUN: %clang %s -target i386-pc-openbsd -nopie -### 2>&1 \
+ // RUN:   | FileCheck %s --check-prefix=CHECK-NOPIE-LD
+ //
++// On Alpine Linux, we want similar PIE-by-default behavior
++// RUN: %clang -c %s -target x86_64-alpine-linux-musl -### 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-PIE2
++// RUN: %clang -c %s -target i686-alpine-linux-musl -### 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-PIE2
++// RUN: %clang -c %s -target armv6-alpine-linux-musleabihf -### 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-PIE2
++// RUN: %clang -c %s -target armv7-alpine-linux-musleabihf -### 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-PIE2
++// RUN: %clang %s -target x86_64-alpine-linux-musl -nopie -### 2>&1 \
++// RUN:   | FileCheck %s --check-prefix=CHECK-NOPIE-LD
++//
+ // On Android PIC is enabled by default
+ // RUN: %clang -c %s -target i686-linux-android -### 2>&1 \
+ // RUN:   | FileCheck %s --check-prefix=CHECK-PIC2
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch b/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
new file mode 100644
index 0000000000..a7ad2d8c3a
--- /dev/null
+++ b/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,28 @@
+From e089ab63916eada060fdfffbf7422c9b20bafe84 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 23 Feb 2016 10:08:17 +0000
+Subject: [PATCH 6/7] Link with -z now by default for Alpine Linux
+
+---
+ lib/Driver/ToolChains.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 82449bf..1a8ebf5 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -3671,6 +3671,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+ 
+   Distro Distro = DetectDistro(D, Arch);
+ 
++  if (Distro == AlpineLinux) {
++    ExtraOpts.push_back("-z");
++    ExtraOpts.push_back("now");
++  }
++
+   if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) {
+     ExtraOpts.push_back("-z");
+     ExtraOpts.push_back("relro");
+-- 
+2.7.3
+
diff --git a/main/clang/clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch b/main/clang/clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch
new file mode 100644
index 0000000000..a4cb926181
--- /dev/null
+++ b/main/clang/clang-0007-Enable-stack-protector-by-default-for-alpine-linux.patch
@@ -0,0 +1,69 @@
+From da8ea517105fff702f936695dcfae844ac85260d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 23 Feb 2016 10:16:54 +0000
+Subject: [PATCH 7/7] Enable stack protector by default for alpine linux
+
+---
+ lib/Driver/ToolChains.cpp     |  7 +++++++
+ lib/Driver/ToolChains.h       |  1 +
+ test/Driver/stack-protector.c | 14 ++++++++++++++
+ 3 files changed, 22 insertions(+)
+
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index 1a8ebf5..59b7601 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -4193,6 +4193,13 @@ void Linux::addProfileRTLibs(const llvm::opt::ArgList &Args,
+   ToolChain::addProfileRTLibs(Args, CmdArgs);
+ }
+ 
++unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
++  StringRef VendorName = Linux::getTriple().getVendorName();
++  if (VendorName.compare("alpine") == 0)
++    return 2;
++  return 1;
++}
++
+ /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.
+ 
+ DragonFly::DragonFly(const Driver &D, const llvm::Triple &Triple,
+diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
+index f940e58..977ea66 100644
+--- a/lib/Driver/ToolChains.h
++++ b/lib/Driver/ToolChains.h
+@@ -796,6 +796,7 @@ public:
+   void AddCudaIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+                           llvm::opt::ArgStringList &CC1Args) const override;
+   bool isPIEDefault() const override;
++  unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
+   SanitizerMask getSupportedSanitizers() const override;
+   void addProfileRTLibs(const llvm::opt::ArgList &Args,
+                         llvm::opt::ArgStringList &CmdArgs) const override;
+diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
+index 487af56..2fbd39a 100644
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -24,6 +24,20 @@
+ // SSP-ALL: "-stack-protector" "3"
+ // SSP-ALL-NOT: "-stack-protector-buffer-size" 
+ 
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // RUN: %clang -target x86_64-scei-ps4 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
+ // RUN: %clang -target x86_64-scei-ps4 -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
+ // SSP-PS4: "-stack-protector" "2"
+-- 
+2.7.3
+