diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/aarch64/tlsdesc.c | 2 | ||||
| -rw-r--r-- | sysdeps/arm/tlsdesc.c | 2 | ||||
| -rw-r--r-- | sysdeps/hppa/start.S | 2 | ||||
| -rw-r--r-- | sysdeps/i386/tlsdesc.c | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/tlsdesc.c | 2 |
6 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 0773d7ce18..2ac8b8a635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-07-09 Will Newton <will.newton@linaro.org> + + * sysdeps/aarch64/tlsdesc.c (_dl_unmap): Test SHARED with #ifdef. + * sysdeps/arm/tlsdesc.c (_dl_unmap): Likewise. + * sysdeps/i386/tlsdesc.c (_dl_unmap): Likewise. + * sysdeps/x86_64/tlsdesc.c (_dl_unmap): Likewise. + * sysdeps/hppa/start.S (_start): Likewise. + 2014-07-09 Siddhesh Poyarekar <siddhesh@redhat.com> * sunrpc/xdr.c (xdr_string): Initialize SIZE to 0. diff --git a/sysdeps/aarch64/tlsdesc.c b/sysdeps/aarch64/tlsdesc.c index 1b4181956c..7e8cf65eac 100644 --- a/sysdeps/aarch64/tlsdesc.c +++ b/sysdeps/aarch64/tlsdesc.c @@ -147,7 +147,7 @@ _dl_unmap (struct link_map *map) { _dl_unmap_segments (map); -#if SHARED +#ifdef SHARED if (map->l_mach.tlsdesc_table) htab_delete (map->l_mach.tlsdesc_table); #endif diff --git a/sysdeps/arm/tlsdesc.c b/sysdeps/arm/tlsdesc.c index e52034ded6..ad74a239ba 100644 --- a/sysdeps/arm/tlsdesc.c +++ b/sysdeps/arm/tlsdesc.c @@ -149,7 +149,7 @@ _dl_unmap (struct link_map *map) { _dl_unmap_segments (map); -#if SHARED +#ifdef SHARED /* _dl_unmap is only called for dlopen()ed libraries, for which calling free() is safe, or before we've completed the initial relocation, in which case calling free() is probably pointless, diff --git a/sysdeps/hppa/start.S b/sysdeps/hppa/start.S index 0998270afd..7254a75703 100644 --- a/sysdeps/hppa/start.S +++ b/sysdeps/hppa/start.S @@ -93,7 +93,7 @@ _start: stw %r23, -56(%sp) /* Need to setup 1, 4, 5, and 7th arguments */ -#if SHARED +#ifdef SHARED /* load main (1st argument) */ addil LT'.Lpmain, %r19 ldw RT'.Lpmain(%r1), %r26 diff --git a/sysdeps/i386/tlsdesc.c b/sysdeps/i386/tlsdesc.c index ef4a1ddf98..19a8788b8f 100644 --- a/sysdeps/i386/tlsdesc.c +++ b/sysdeps/i386/tlsdesc.c @@ -261,7 +261,7 @@ _dl_unmap (struct link_map *map) { _dl_unmap_segments (map); -#if SHARED +#ifdef SHARED if (map->l_mach.tlsdesc_table) htab_delete (map->l_mach.tlsdesc_table); #endif diff --git a/sysdeps/x86_64/tlsdesc.c b/sysdeps/x86_64/tlsdesc.c index c1c5e033c0..451f7be2d0 100644 --- a/sysdeps/x86_64/tlsdesc.c +++ b/sysdeps/x86_64/tlsdesc.c @@ -139,7 +139,7 @@ _dl_unmap (struct link_map *map) { _dl_unmap_segments (map); -#if SHARED +#ifdef SHARED /* _dl_unmap is only called for dlopen()ed libraries, for which calling free() is safe, or before we've completed the initial relocation, in which case calling free() is probably pointless, |