aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-06-07 12:33:50 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-11 13:35:29 +0000
commit54db62760803072c5308e62d769048d2f50b68be (patch)
tree547e3585968111e805c79fb16313436a8e615b1d
parent3c17be04ec487849bbaced32301bcb58deb996f4 (diff)
downloadaports-54db62760803072c5308e62d769048d2f50b68be.tar.gz
aports-54db62760803072c5308e62d769048d2f50b68be.tar.bz2
aports-54db62760803072c5308e62d769048d2f50b68be.tar.xz
main/clang: upgrade to 8.0.0
-rw-r--r--main/clang/10-add-musl-triples.patch38
-rw-r--r--main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch6
-rw-r--r--main/clang/APKBUILD11
3 files changed, 20 insertions, 35 deletions
diff --git a/main/clang/10-add-musl-triples.patch b/main/clang/10-add-musl-triples.patch
index fa837bbdef..171467470b 100644
--- a/main/clang/10-add-musl-triples.patch
+++ b/main/clang/10-add-musl-triples.patch
@@ -1,42 +1,26 @@
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1813,7 +1814,9 @@
- static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
- "armv7hl-redhat-linux-gnueabi",
- "armv6hl-suse-linux-gnueabi",
-- "armv7hl-suse-linux-gnueabi"};
-+ "armv7hl-suse-linux-gnueabi",
-+ "arm-linux-musleabihf",
-+ "armv7l-linux-musleabihf"};
- static const char *const ARMebLibDirs[] = {"/lib"};
- static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
- "armeb-linux-androideabi"};
---- a/lib/Driver/ToolChains/Gnu.cpp
-+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1812,7 +1812,7 @@
+@@ -1871,6 +1871,7 @@
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
static const char *const AArch64Triples[] = {
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-- "aarch64-suse-linux"};
-+ "aarch64-suse-linux","aarch64-linux-musl"};
++ "aarch64-linux-musl",
+ "aarch64-suse-linux", "aarch64-linux-android"};
static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
- "aarch64_be-linux-gnu"};
-@@ -1837,14 +1837,15 @@
+@@ -1898,6 +1899,7 @@
"x86_64-redhat-linux", "x86_64-suse-linux",
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
"x86_64-slackware-linux", "x86_64-unknown-linux",
-- "x86_64-amazon-linux"};
-+ "x86_64-amazon-linux", "x86_64-linux-musl"};
++ "x86_64-linux-musl",
+ "x86_64-amazon-linux", "x86_64-linux-android"};
static const char *const X32LibDirs[] = {"/libx32"};
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
- static const char *const X86Triples[] = {
- "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
- "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
+@@ -1907,6 +1909,7 @@
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
-- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"};
-+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
-+ "i686-linux-musl"};
+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
+ "i686-linux-android", "i386-gnu", "i486-gnu",
++ "i686-linux-musl",
+ "i586-gnu", "i686-gnu"};
static const char *const MIPSLibDirs[] = {"/lib"};
- static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux",
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
index d545a5aff8..b63ecadc00 100644
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -24,14 +24,14 @@ diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
index 22dbbec..ba0d558 100644
--- a/lib/Driver/ToolChains/Linux.h
+++ b/lib/Driver/ToolChains/Linux.h
-@@ -38,6 +38,7 @@ public:
- void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+@@ -39,6 +39,7 @@
llvm::opt::ArgStringList &CC1Args) const override;
+ CXXStdlibType GetDefaultCXXStdlibType() const override;
bool isPIEDefault() const override;
+ unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
+ bool IsMathErrnoDefault() const override;
SanitizerMask getSupportedSanitizers() const override;
void addProfileRTLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
index 304e759..29ead22 100644
--- a/test/Driver/fsanitize.c
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
index da0ebd32bb..494fc73ee0 100644
--- a/main/clang/APKBUILD
+++ b/main/clang/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=clang
# Note: Update together with llvm.
-pkgver=7.0.1
-pkgrel=1
+pkgver=8.0.0
+pkgrel=0
_llvmver=${pkgver%%.*}
pkgdesc="A C language family front-end for LLVM"
arch="all"
@@ -23,6 +23,7 @@ makedepends="
ninja
python3
"
+checkdepends="diffutils bash"
depends_dev="$pkgname=$pkgver-r$pkgrel"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-analyzer::noarch"
@@ -90,6 +91,6 @@ analyzer() {
mv usr/share/scan-* "$subpkgdir"/usr/share/
}
-sha512sums="df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194 cfe-7.0.1.src.tar.xz
-b52cb7d74636d39d12dd6c94a2b2a9c01e4d6a535d151aa8ca49b691eb20e1b4ea08481f1517ef81f4501ebc305a32d7951638cc0385fee134131e827bb0b2f3 10-add-musl-triples.patch
-b98f39354adf7cf09de5bcac498cccb5c5dd4b8ba7ea0e6c18f2f2204650288088a12b7a535451e21a451b890b70430d679a09df7161de03dbf30d6b49ee1ec0 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch"
+sha512sums="98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 cfe-8.0.0.src.tar.xz
+367dcd43b42570b5688c4bb41daf2498447e9fa4384896e2b91782017a8ce15b1e6e15cb3a465595d69e681420fce170a6f9a57ea5268e21f0dec7d4605e4c4c 10-add-musl-triples.patch
+97633748b8cb125d606dbbf22381a4371abf0f49a1632cc19e84a361f16677ca3bc1a7c87943a2875cb6d39e6b72728aa21f09a49ca435558841f53b44568727 20-Enable-stack-protector-by-default-for-Alpine-Linux.patch"