diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-03-26 06:24:32 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-26 06:24:32 +0000 |
| commit | 82be8474198d7a29ae784ff677a0a0b48d0133a5 (patch) | |
| tree | b1d31dca7f36801e8fcecc11480dbb21699c15c7 /main/musl/2001-workaround-gcc-pr58245.patch | |
| parent | d2bf04f6c61c8900da1ee537b3a630a484d2d2a8 (diff) | |
| download | aports-82be8474198d7a29ae784ff677a0a0b48d0133a5.tar.bz2 aports-82be8474198d7a29ae784ff677a0a0b48d0133a5.tar.xz | |
main/musl: apply changes from upstream git
* remove the upstreamed confstr patch
* remove relro patch which got fixed and upstreamed, ref #2614
(the old version did not relro protect libc.so itself)
* workaround for gcc pr58245 is no longer needed as thread pointer
is always initialized and the lazy ssp init is removed
Diffstat (limited to 'main/musl/2001-workaround-gcc-pr58245.patch')
| -rw-r--r-- | main/musl/2001-workaround-gcc-pr58245.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/main/musl/2001-workaround-gcc-pr58245.patch b/main/musl/2001-workaround-gcc-pr58245.patch deleted file mode 100644 index 5f57d352f..000000000 --- a/main/musl/2001-workaround-gcc-pr58245.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Timo Teräs <timo.teras@iki.fi> - -Due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58245 many simple -programs can fail. Since in Alpine Linux everything default to be -built with -fstack-protector-all, we can just assume SSP being always -used. - -Not suitable to upstream, as this incurs startup overhead that is not -desirable unless SSP is really used. - -diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c -index a525b3d..a1b8471 100644 ---- a/src/ldso/dynlink.c -+++ b/src/ldso/dynlink.c -@@ -99,7 +99,7 @@ void __init_libc(char **, char *); - static struct dso *head, *tail, *ldso, *fini_head; - static char *env_path, *sys_path; - static unsigned long long gencnt; --static int ssp_used; -+static int ssp_used = 1; - static int runtime; - static int ldd_mode; - static int ldso_fail; - |