diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-07 02:39:40 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-07 02:40:34 +0000 |
| commit | 94628432b84d6c739deab02e7ed9a532f517a686 (patch) | |
| tree | b9727bc5bc06b47c90a27f74a5e46cd61d5a9441 /user/llvm7 | |
| parent | a04f1bdf2bc5420b245130a24b07a5efe4aa2d04 (diff) | |
| download | packages-94628432b84d6c739deab02e7ed9a532f517a686.tar.gz packages-94628432b84d6c739deab02e7ed9a532f517a686.tar.bz2 packages-94628432b84d6c739deab02e7ed9a532f517a686.tar.xz packages-94628432b84d6c739deab02e7ed9a532f517a686.zip | |
user/llvm7: fix PPC32 Secure PLT code
Diffstat (limited to 'user/llvm7')
| -rw-r--r-- | user/llvm7/APKBUILD | 2 | ||||
| -rw-r--r-- | user/llvm7/more-secure-plt.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/user/llvm7/APKBUILD b/user/llvm7/APKBUILD index 53cf78e63..d4b78cef0 100644 --- a/user/llvm7/APKBUILD +++ b/user/llvm7/APKBUILD @@ -246,7 +246,7 @@ f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3ce 49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200 disable-dlclose-test.patch e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch -8c0e2a08f6b503efb6673af4cb475ed788b288e016881eacb314a74b9cdd1a920853b219f1cdf1c20e67dec9fcceedfa37e726820b28cd0454302397188aac2f more-secure-plt.patch +dcd34b81c2f2843cd05b2e3b88e268045a2ec6ed8677630fc8904f38b2131cbc0ba37dde461e28b1c301d5e95b634b2e225797f8a5585c0cabc69e3b7e78de85 more-secure-plt.patch deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch c3f596a1578a07ce0ee40c4e2576fe05ca6ca0c1b4f94b1f74c55cb09603afe7c846db9294fe28d83ca48633086bad422218e6d06e0d92173143fb298e06fb38 ppc32-calling-convention.patch 53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch" diff --git a/user/llvm7/more-secure-plt.patch b/user/llvm7/more-secure-plt.patch index 64920c74c..1a32eea4f 100644 --- a/user/llvm7/more-secure-plt.patch +++ b/user/llvm7/more-secure-plt.patch @@ -1,3 +1,16 @@ +--- a/lib/Target/PowerPC/PPCSubtarget.cpp ++++ b/lib/Target/PowerPC/PPCSubtarget.cpp +@@ -138,6 +138,10 @@ + if (isDarwin()) + HasLazyResolverStubs = true; + ++ // Set up musl-specific properties. ++ if (TargetTriple.getEnvironment() == Triple::Musl) ++ SecurePlt = true; ++ + if (HasSPE && IsPPC64) + report_fatal_error( "SPE is only supported for 32-bit targets.\n", false); + if (HasSPE && (HasAltivec || HasQPX || HasVSX || HasFPU)) diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index c583fba8cab..6a9eedf89c5 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp |