2004-07-19 Christopher Faylor <cgf@timesys.com>

	    H.J. Lu  <hongjiu.lu@intel.com>

	* subsegs.c (section_symbol): Don't create a new segment when
	existing segment is undefined.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 933e8541502e355693dfab39637857a60f70cab4..67257235689aea253e42eccb25bee530f9fe3d6f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-19  Christopher Faylor  <cgf@timesys.com>
+           H.J. Lu  <hongjiu.lu@intel.com>
+
+       * subsegs.c (section_symbol): Don't create a new segment when
+       existing segment is undefined.
+
 2004-07-16  Richard Earnshaw  <rearnsha@arm.com>
 
        * config/tc-arm.c: Include include/opcode/arm.h.

diff --git a/gas/subsegs.c b/gas/subsegs.c
index 9e46cfe341923e4c95b1bafe7f5dff449e5b441d..8b0679cbc4c478d678ae677e134c84a9ccb586a6 100644 (file)
--- a/gas/subsegs.c
+++ b/gas/subsegs.c
@@ -523,18 +523,18 @@ section_symbol (segT sec)
     }
   else
     {
+      segT seg;
       s = symbol_find_base (sec->symbol->name, 0);
       /* We have to make sure it is the right symbol when we
         have multiple sections with the same section name.  */
-      if (s == NULL || S_GET_SEGMENT (s) != sec)
+      if (s == NULL
+         || ((seg = S_GET_SEGMENT (s)) != sec
+             && seg != undefined_section))
        s = symbol_new (sec->symbol->name, sec, 0, &zero_address_frag);
-      else
+      else if (seg == undefined_section)
        {
-         if (S_GET_SEGMENT (s) == undefined_section)
-           {
-             S_SET_SEGMENT (s, sec);
-             symbol_set_frag (s, &zero_address_frag);
-           }
+         S_SET_SEGMENT (s, sec);
+         symbol_set_frag (s, &zero_address_frag);
        }
     }