diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-06 15:11:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-07 07:22:42 +0000 |
| commit | d5f82899c4fb6072f992db6b1b19d9b6e26aeb95 (patch) | |
| tree | 503f6c69ec0dfe32db9dafef2f9200661af6e822 /main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch | |
| parent | 754c0c888f81d4fab2e7cde320816ff901bd451e (diff) | |
| download | aports-d5f82899c4fb6072f992db6b1b19d9b6e26aeb95.tar.bz2 aports-d5f82899c4fb6072f992db6b1b19d9b6e26aeb95.tar.xz | |
main/libc0.9.32: upgrade to 0.9.33
Diffstat (limited to 'main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch')
| -rw-r--r-- | main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch index b60dd446e7..eb60a50a94 100644 --- a/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch +++ b/main/libc0.9.32/0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch @@ -1,7 +1,7 @@ -From 3fb4bfcafbcaff3522e7bab48ff03460fec99023 Mon Sep 17 00:00:00 2001 +From d0d708fffcc475973736aea3759f4d7944a4629a Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Fri, 23 Dec 2011 14:06:09 +0100 -Subject: [PATCH] Compatible stack protector for non Thread Local storage +Subject: [PATCH 1/8] Compatible stack protector for non Thread Local storage Before we had thread local storage the __stack_chk_guard was a global variable that was referenced to by the older binaries. @@ -13,10 +13,10 @@ We since then have changed ABI so this patch can probably go away. 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c -index 7ee9257..3585cb7 100644 +index 014bbf5..7690036 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c -@@ -103,11 +103,7 @@ extern void _start(void); +@@ -121,11 +121,7 @@ extern void _start(void); #ifdef __UCLIBC_HAS_SSP__ # include <dl-osinfo.h> static uintptr_t stack_chk_guard; @@ -28,7 +28,7 @@ index 7ee9257..3585cb7 100644 # ifdef __UCLIBC_HAS_SSP_COMPAT__ uintptr_t __guard attribute_relro; # endif -@@ -951,9 +947,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, +@@ -1189,9 +1185,8 @@ of this helper program; chances are you did not intend to run this program.\n\ stack_chk_guard = _dl_setup_stack_chk_guard (); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); @@ -40,7 +40,7 @@ index 7ee9257..3585cb7 100644 __guard = stack_chk_guard; # endif diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index 315365a..78cd058 100644 +index 71fdbd8..3a24acd 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -46,12 +46,7 @@ void *__libc_stack_end = NULL; @@ -56,7 +56,7 @@ index 315365a..78cd058 100644 /* for gcc-3.x + Etoh ssp */ # ifdef __UCLIBC_HAS_SSP_COMPAT__ uintptr_t __guard attribute_relro; -@@ -247,9 +242,8 @@ void __uClibc_init(void) +@@ -251,9 +246,8 @@ void __uClibc_init(void) stack_chk_guard = _dl_setup_stack_chk_guard(); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); @@ -68,5 +68,5 @@ index 315365a..78cd058 100644 __guard = stack_chk_guard; # endif -- -1.7.8 +1.7.8.4 |