diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-26 17:17:40 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-26 17:18:20 +0000 |
| commit | a76e836073fe67d8c41e87f599f4d282fb5f202f (patch) | |
| tree | 8ad0c3cc565827a310a8030fa35d35f48e74b8c9 | |
| parent | b25ed2a8a246932286bca92bae5b4f11135cc09e (diff) | |
main/gcc: fix alpine/musl specific libssp patch
| -rw-r--r-- | main/gcc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/gcc/gcc-4.8-musl-libssp.patch | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 488dde45dd9..de2e30b0777 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -660,7 +660,7 @@ ab83248e10b2bf4b3d9240de0fefb52b pt_gnu_eh_frame.patch 79d00ee1284fac5192456f7f7d3908aa gcc-4.8-dynamic-linker.patch ae660a0cb265b3115cde8f7efb41f7cc gcc-4.8-musl.patch 6e5c32243a86ff35b7b47d18c95b31bd gcc-4.8-musl-fix-iteratephdr.patch -60de2c9f78f00b8b0ba5d24fb44ea592 gcc-4.8-musl-libssp.patch +0d0a41c02802b85c8f1b78ce28544f92 gcc-4.8-musl-libssp.patch 2c6cb49bb9bfd8b6e690222e66ccc901 boehm-gc-uclibc.patch ea2749b1337a5d850a8f463071cc4747 boehm-gc-musl.patch 2e2b787bb988d9007c9f7ce42178dfe6 gcc-pure64.patch @@ -695,7 +695,7 @@ da6bbb5dc654d5e1df8ecae5c9ebb56265426c405931f14f5878248b8c79f78d 51_all_libiber f3863b997acf8fdf5ad1d3626b41a8a0670b896505e9b7afb517916c7599fb1c gcc-4.8-dynamic-linker.patch 847075eb79c94e062ab8fb566f3bbea007875e2fde6fe2ddf51a18e731796a67 gcc-4.8-musl.patch 151c11c3303233e6ff06e27aa6dc889140bc46a7b5e4870587c40e37d36ede2c gcc-4.8-musl-fix-iteratephdr.patch -ce0168ce009d77ce5831cb71739675cad6d68283b6e57fa8f2e559d65502022d gcc-4.8-musl-libssp.patch +80b76ca30dcaf07481ab102869d741f044c7e5235f462182bc27467baacda9a4 gcc-4.8-musl-libssp.patch 02751ccf223dcfc898c0ce2214cd0859d275e90b742f1a66e38db5c50f94b38c boehm-gc-uclibc.patch 6adcddbc9d52b4e39878155bc7ff0114c322e0f05c0c82dff8c06c7278313f73 boehm-gc-musl.patch f5473c6aea96d5137defd68898ba31042944a3f3ed26c05b964a40bd876c6f47 gcc-pure64.patch @@ -730,7 +730,7 @@ e3edf75df1f27af8771bd263e1bd607f6207c4eb5b2a5e11032577deba43ea201825e3b5008a7201 db84b6582950378116723116be4f277881f7bdd05add216c58c2b86c0fb3a70abeb7798507a74a64b9b949d5b311167bd4df84a048d2d2d32f5836ea1d34c42e gcc-4.8-dynamic-linker.patch 12871b62d31a8e524547f2f0b37e711bae027aaadc487d893f8dc4cef2c2fee09f5c558cd7e1d28e0c687bc3be0465d1088c5ef7b87e8ac43ac06d86dc455761 gcc-4.8-musl.patch b5b0210dfaccfe0b06f0a9090666b1fae2a3faa4140b7930146b29531f0da9beb1f2c1f7e7bc2bd29179f9fe05dc30e246e96220b8ff75a90f75e8350c9058a1 gcc-4.8-musl-fix-iteratephdr.patch -701c79ea7b90e622facb16fc71902aec25c443e376d675fc3f07cd55eff7a6b95ca365b2c60fff1dad3c3dc02b96c4c2ebbb45e4d2895496137e060443ae3e79 gcc-4.8-musl-libssp.patch +e6d9b103c128e5d4eca515b1496d78b05708de770597c883daddd95ea41e77b5ef1be613b989357cc870a7efd9e43b011022c2d302e7056cff7b69e764906ff2 gcc-4.8-musl-libssp.patch e1d6a450dfb40b134ad7f759c4c10174d2490b0093fe47cb33479245f26a3a8c54ebcf6255943c0ccfcb5095600d1c05e530baeed35609c8ffe75caac8e57c49 boehm-gc-uclibc.patch 7db904f83546edb4f7e54d3eaa0a8ab3235bca69e03a35000f083d26626bff92713f73150935c89f51e47c952bf29c36ec7d2fc8fedcde38048975e3e590faf9 boehm-gc-musl.patch 4a5aeff0399782c752e6e3f2f48d984b2056dfb5d229b23a24eee1562d241339989b2203f139821cfc03c9b25c9bd7da6ccbbdc7a09d242e4de7f0d606c6f63c gcc-pure64.patch diff --git a/main/gcc/gcc-4.8-musl-libssp.patch b/main/gcc/gcc-4.8-musl-libssp.patch index ba6d5c304ef..88725c8e461 100644 --- a/main/gcc/gcc-4.8-musl-libssp.patch +++ b/main/gcc/gcc-4.8-musl-libssp.patch @@ -1,3 +1,11 @@ +Author: Timo Teräs <timo.teras@iki.fi> + +Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, +as otherwise we get link failures if some objects are -fstack-protector built +and final link happens with -fno-stack-protector. This seems to be the common +case when bootstrapping gcc, the piepatches do not seem to fully fix the +crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. + --- gcc-4.8.1/gcc/gcc.c.orig 2013-09-24 06:27:32.133894539 +0000 +++ gcc-4.8.1/gcc/gcc.c 2013-09-24 06:29:35.790562854 +0000 @@ -656,7 +656,9 @@ @@ -6,7 +14,7 @@ #ifndef LINK_SSP_SPEC -#ifdef TARGET_LIBC_PROVIDES_SSP +#if DEFAULT_LIBC == LIBC_MUSL -+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared}" ++#define LINK_SSP_SPEC "-lssp_nonshared" +#elif defined(TARGET_LIBC_PROVIDES_SSP) #define LINK_SSP_SPEC "%{fstack-protector:}" #else |