* config/obj-coff.h (USE_UNIQUE): Don't define.

	* config/obj-coff.c (weak_uniquify): Use an_external_name when TE_PE.
	* symbols.c (an_external_name): Define when TE_PE.
	(S_SET_EXTERNAL): Assign an_external_name when TE_PE.
	* tc.h (an_external_name): Declare when TE_PE.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a52d8f4afc2be5780b069c9ca80be52ea963e18f..daefbd644f2691d604561dcd0b42272d85d03231 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-09  Alan Modra  <amodra@bigpond.net.au>
 
+       * config/obj-coff.h (USE_UNIQUE): Don't define.
+       * config/obj-coff.c (weak_uniquify): Use an_external_name when TE_PE.
+       * symbols.c (an_external_name): Define when TE_PE.
+       (S_SET_EXTERNAL): Assign an_external_name when TE_PE.
+       * tc.h (an_external_name): Declare when TE_PE.
+
        * config/tc-i386.c (i386_target_format): Avoid duplicate case label.
 
 2009-09-08  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index ed6a718f7f790832d4748deb7f984764b3ffec42..271b01ef3dc3ff3163f4b791ee135de5a169a6f0 100644 (file)
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -1117,7 +1117,7 @@ weak_uniquify (const char * name)
   char *ret;
   const char * unique = "";
 
-#ifdef USE_UNIQUE
+#ifdef TE_PE
   if (an_external_name != NULL)
     unique = an_external_name;
 #endif

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 513890fa194555ab3244d2beb5d6fc2391509a55..7b9b744d85b00881ae9ba1f060890c7333588e08 100644 (file)
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -162,9 +162,6 @@
 #endif
 
 #ifdef TE_PE
-/* PE weak symbols need USE_UNIQUE.  */
-#define USE_UNIQUE 1
-
 #define obj_set_weak_hook pecoff_obj_set_weak_hook
 #define obj_clear_weak_hook pecoff_obj_clear_weak_hook
 #endif

diff --git a/gas/symbols.c b/gas/symbols.c
index c72946b8505b2974085b719de366971a61778048..9ce45886fbd2fbe3e2c2b409b88c5511a4a0b705 100644 (file)
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -59,7 +59,7 @@ symbolS abs_symbol;
 #define LOCAL_LABEL_CHAR       '\002'
 
 struct obstack notes;
-#ifdef USE_UNIQUE
+#ifdef TE_PE
 /* The name of an external symbol which is
    used to make weak PE symbol names unique.  */
 const char * an_external_name;
@@ -2204,7 +2204,7 @@ S_SET_EXTERNAL (symbolS *s)
   s->bsym->flags |= BSF_GLOBAL;
   s->bsym->flags &= ~(BSF_LOCAL | BSF_WEAK);
 
-#ifdef USE_UNIQUE
+#ifdef TE_PE
   if (! an_external_name && S_GET_NAME(s)[0] != '.')
     an_external_name = S_GET_NAME (s);
 #endif

diff --git a/gas/tc.h b/gas/tc.h
index 4386fe5f505b931ac5db6acbc791e654422d6944..ff1cf3618add135755e1064bda7cbb82e83a83b5 100644 (file)
--- a/gas/tc.h
+++ b/gas/tc.h
@@ -41,7 +41,7 @@ extern int md_short_jump_size;
 extern int md_long_jump_size;
 #endif
 
-#ifdef USE_UNIQUE
+#ifdef TE_PE
 /* The name of an external symbol which is
    used to make weak PE symbol names unique.  */
 extern const char * an_external_name;