From: Will Newton <will.newton@linaro.org>
Date: Mon, 7 Jul 2014 14:14:26 +0000 (+0100)
Subject: Fix -Wundef warnings for SHARED
X-Git-Tag: glibc-2.20~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82374e65d745c3c94258ad81c38f8af34b9f9113;p=thirdparty%2Fglibc.git

Fix -Wundef warnings for SHARED

The definition of SHARED is tested with #ifdef pretty much everywhere
apart from these few places. The tlsdesc.c code seems to be copy and
pasted to a few architectures and there is one instance in the hppa
startup code.

ChangeLog:

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.
---

diff --git a/ChangeLog b/ChangeLog
index 0773d7ce18a..2ac8b8a6356 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 1b4181956c3..7e8cf65eacd 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 e52034ded6f..ad74a239ba8 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 0998270afd3..7254a75703b 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 ef4a1ddf98c..19a8788b8ff 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 c1c5e033c0d..451f7be2d0c 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,