diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-25 08:48:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-25 09:00:11 +0000 |
| commit | 16d332d96a9626de04212b6d54769b776d14b88b (patch) | |
| tree | ef36cf461c792592478d4be485d2d3597f381cc6 | |
| parent | 07cb73824dbb9fa695fb3fe2baf3e69bdff49016 (diff) | |
| download | aports-16d332d96a9626de04212b6d54769b776d14b88b.tar.bz2 aports-16d332d96a9626de04212b6d54769b776d14b88b.tar.xz | |
main/llvm: fix build on x86
| -rw-r--r-- | main/llvm/APKBUILD | 6 | ||||
| -rw-r--r-- | main/llvm/compiler-rt-sanitizer-off_t.patch | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index 5f2cccae94..793a8383cf 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -4,7 +4,7 @@ pkgname=llvm pkgver=3.6.0 pkgrel=1 pkgdesc="low level virtual machine compiler system" -arch="x86_64 armhf" +arch="all" url="http://llvm.org/" license="UOI-NCSA" depends="" @@ -21,6 +21,7 @@ source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz llvm-3.6-musl.patch compiler-rt-3.6-musl-disable-sanitizers.patch compiler-rt-3.6-musl-no-dlvsym.patch + compiler-rt-sanitizer-off_t.patch clang-3.5-fix-stdint.patch clang-3.6-fix-unwind-chain-inclusion.patch clang-3.6-remove-lgcc-when-using-compiler-rt.patch @@ -193,6 +194,7 @@ cc36dbcafe43406083e98bc9e74f8054 compiler-rt-3.6.0.src.tar.xz 3068c2bc0dd0f694d002d992743401ac llvm-3.6-musl.patch b1732677fb7641c13300a98bdd47d467 compiler-rt-3.6-musl-disable-sanitizers.patch a56d3a3da587b5936e338d85947bd16f compiler-rt-3.6-musl-no-dlvsym.patch +8bc11d4a60af51a7fc10643bd0970d3a compiler-rt-sanitizer-off_t.patch be9b343bacbd220a154b0a773bcd3bd3 clang-3.5-fix-stdint.patch 02df7f41728ceb3b401dd3972531d4ec clang-3.6-fix-unwind-chain-inclusion.patch 9790d1131f498f5957e0107727489704 clang-3.6-remove-lgcc-when-using-compiler-rt.patch @@ -212,6 +214,7 @@ fbe1bab0aa5eb8c54ac1ed0f7d27212efd597c8eaa889599549d0defe82bc7c9 llvm-3.6-musl- f1ca24437533c5022d591b8b9a5ea7f0494e984a5c24ef1e5dcf71dbee0df240 llvm-3.6-musl.patch d5aa68e35fe3fe0cb2393d3abecd80987c4876f332ca03b55f03bcd82b2b720d compiler-rt-3.6-musl-disable-sanitizers.patch 90a582ef8561ed4953feae7f19f3a30856da845174ae93e7acdb4bc088be5b78 compiler-rt-3.6-musl-no-dlvsym.patch +45bcfa7d1c757e32183c5cd95703f150ec3d1ed966a9cfa68b13b648e5310e78 compiler-rt-sanitizer-off_t.patch a41aa73b9edcf0588d61e17e9d53738e9e16209eac9c5488eaef7770ab1517d1 clang-3.5-fix-stdint.patch 2c73e2c6f3e90e2535e0662714645fc4d1189b4b1beb5a0ebb6ba1af62580d23 clang-3.6-fix-unwind-chain-inclusion.patch dea41fd9eb16d2c3b9b73ad1ee3af2923b26f806185494835c899700ec6830f4 clang-3.6-remove-lgcc-when-using-compiler-rt.patch @@ -231,6 +234,7 @@ a084b995b2ea65c19da5e000459c993d5a3396f0eb4f6d6ec29299d98f3df8ee6f23723f8d19e93e e3f4203679c978cbf359200de0cd60c0adcc58c92611ec70b4b991c6612e0b41b67c19c9994769302284edb953e258d3717ec32d90abbd9bdeff3739aa5ffb18 llvm-3.6-musl.patch e9cf172aac82b5e4680d4c6fb25f11e04d1db75ad4e99f7117c08631ca8a7955677fc046f58b6eef05f9e98ef0374eb9248b5674aa26b08d9f7efd30525740be compiler-rt-3.6-musl-disable-sanitizers.patch 8cde42c93a1eda14d31f8e51ffd00d031f10071e9a4ee91fa9b08ef5b8e7bf9ec32ccd102b652e35e6f75d1339d934daa68185529ca6dba74e61f979a27498f3 compiler-rt-3.6-musl-no-dlvsym.patch +effed16bed6160c1629c72960424afed87f8c1c1290bf4eccd43da5a1fcb5b350242c01fcc1cc7355b420f5ac80231ea7a33ca71cafad884ea4c756cbdfbdd59 compiler-rt-sanitizer-off_t.patch 764382fc79598ca85c9c500d16e02a2710025416dc9bd8a7407aad38e663dee9539e47a1ae763b45c36cd86c4ff5853c4799835cd7363a3a208191ae7a703321 clang-3.5-fix-stdint.patch 4cbabce34b7352bf5a043db3abe8931f58adce4fda80846c39b63399a025cbbac572052d3f0f598466bc9dca23b8ff88e655b10bf54b3870bc4e6f4225b6f558 clang-3.6-fix-unwind-chain-inclusion.patch d50aa3271e9247896bd3df5a55c987da81a01892af8afbd0483cff4c0467b2dc438fa9166d1aaeaf5165555c30d4a2af68c3bdbfa8fba798c2ca124172cf2642 clang-3.6-remove-lgcc-when-using-compiler-rt.patch diff --git a/main/llvm/compiler-rt-sanitizer-off_t.patch b/main/llvm/compiler-rt-sanitizer-off_t.patch new file mode 100644 index 0000000000..eee8ab0626 --- /dev/null +++ b/main/llvm/compiler-rt-sanitizer-off_t.patch @@ -0,0 +1,16 @@ +on musl libc off_t is always 64bit + +This is needed for interception to build on 32 bit musl + +--- a/lib/sanitizer_common/sanitizer_internal_defs.h ++++ b/lib/sanitizer_common/sanitizer_internal_defs.h +@@ -87,7 +87,8 @@ + // like pread and mmap, as opposed to pread64 and mmap64. + // FreeBSD, Mac and Linux/x86-64 are special. + #if SANITIZER_FREEBSD || SANITIZER_MAC || \ +- (SANITIZER_LINUX && defined(__x86_64__)) ++ (SANITIZER_LINUX && \ ++ (defined(__x86_64__) || (!defined(__GLIBC__) && !SANITIZER_ANDROID))) + typedef u64 OFF_T; + #else + typedef uptr OFF_T; |