From: DJ Delorie <dj@redhat.com>
Date: Mon, 24 Jul 2000 17:50:35 +0000 (+0000)
Subject: * config/obj-coff.c (obj_frob_symbol): Don't merge
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39da8128405ba3c241ff51cf54cff7f82f6674ba;p=binutils-gdb.git

* config/obj-coff.c (obj_frob_symbol): Don't merge
labels. Don't merge if the symbol isn't constant. Return
immediately if a symbol is merged.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f7501d0e785..ef156d97645 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-24  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* config/obj-coff.c (obj_frob_symbol): Don't merge
+	labels. Don't merge if the symbol isn't constant. Return
+	immediately if a symbol is merged.
+
 2000-07-22  Alan Modra  <alan@linuxcare.com.au>
 
 	* frags.c (frag_align): Correct absolute section alignment.
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 41fc595eaf4..935e3f253d8 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -1139,11 +1139,14 @@ coff_frob_symbol (symp, punt)
       symbolS *real;
       if (!SF_GET_LOCAL (symp)
 	  && !SF_GET_STATICS (symp)
+	  && S_GET_STORAGE_CLASS (symp) != C_LABEL
+	  && symbol_constant_p(symp)
 	  && (real = symbol_find_base (S_GET_NAME (symp), DO_NOT_STRIP))
 	  && real != symp)
 	{
 	  c_symbol_merge (symp, real);
 	  *punt = 1;
+	  return;
 	}
       if (!S_IS_DEFINED (symp) && !SF_GET_LOCAL (symp))
 	{