aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-05-04 01:00:04 +0000
committerIan Lance Taylor <ian@airs.com>1996-05-04 01:00:04 +0000
commitd4d7d98cbf51944dc852076f54f784883ee62e71 (patch)
treef73a9f9b501194f699c2cc4076145420cc7f5ae1
parent8d1d94b6bec5bcfd6a35c384659000f435210883 (diff)
downloadbinutils-d4d7d98cbf51944dc852076f54f784883ee62e71.zip
binutils-d4d7d98cbf51944dc852076f54f784883ee62e71.tar.gz
binutils-d4d7d98cbf51944dc852076f54f784883ee62e71.tar.bz2
* config/obj-coff.c (coff_frob_symbol): Don't merge a symbol with
SF_GET_STATICS set. (yank_symbols): Likewise.
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/obj-coff.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c915fc2..cd9461a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 3 17:58:31 1996 Ian Lance Taylor <ian@cygnus.com>
+
+ * config/obj-coff.c (coff_frob_symbol): Don't merge a symbol with
+ SF_GET_STATICS set.
+ (yank_symbols): Likewise.
+
Wed May 1 13:38:17 1996 Ian Lance Taylor <ian@cygnus.com>
* subsegs.h (segment_info_type): If MANY_SEGMENTS and not
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 94078e8..0639d6b 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -962,6 +962,7 @@ coff_frob_symbol (symp, punt)
{
symbolS *real;
if (!SF_GET_LOCAL (symp)
+ && !SF_GET_STATICS (symp)
&& (real = symbol_find_base (S_GET_NAME (symp), DO_NOT_STRIP))
&& real != symp)
{
@@ -2600,6 +2601,7 @@ yank_symbols ()
/* L* and C_EFCN symbols never merge. */
if (!SF_GET_LOCAL (symbolP)
+ && !SF_GET_STATICS (symbolP)
&& S_GET_STORAGE_CLASS (symbolP) != C_LABEL
&& symbolP->sy_value.X_op == O_constant
&& (real_symbolP = symbol_find_base (S_GET_NAME (symbolP), DO_NOT_STRIP))