From 22ba0981786d9fc6ab459bc449735d51f437dbe8 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 9 Sep 2009 13:19:51 +0000 Subject: [PATCH] * 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. --- gas/ChangeLog | 6 ++++++ gas/config/obj-coff.c | 2 +- gas/config/obj-coff.h | 3 --- gas/symbols.c | 4 ++-- gas/tc.h | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index a52d8f4afc2..daefbd644f2 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,11 @@ 2009-09-09 Alan Modra + * 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 diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c index ed6a718f7f7..271b01ef3dc 100644 --- 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 513890fa194..7b9b744d85b 100644 --- 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 c72946b8505..9ce45886fbd 100644 --- 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 4386fe5f505..ff1cf3618ad 100644 --- 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; -- 2.30.2