All predefined sections to be of NOBITS type

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c682505..012aa13 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 29 13:58:35 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+       * config/obj-elf.c (obj_elf_section): Allow predefined section
+       types to set the nobits type.  Advoid a shadowed declaration.
+
 Wed Feb 28 15:38:56 1996  Jeffrey A Law  (law@cygnus.com)
 
        * config/tc-hppa.c (hppa_fix_adjustable): For SOM, don't

diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index f4f523b..8797672 100644 (file)
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -506,12 +506,12 @@ obj_elf_section (xxx)
 
   if (flag_mri)
     {
-      char type;
+      char mri_type;
 
       previous_section = now_seg;
       previous_subsection = now_subseg;
 
-      s_mri_sect (&type);
+      s_mri_sect (&mri_type);
 
 #ifdef md_elf_section_change_hook
       md_elf_section_change_hook ();
@@ -733,20 +733,19 @@ obj_elf_section (xxx)
           | ((attr & SHF_WRITE) ? 0 : SEC_READONLY)
           | ((attr & SHF_ALLOC) ? SEC_ALLOC | SEC_LOAD : 0)
           | ((attr & SHF_EXECINSTR) ? SEC_CODE : 0));
-  if (special_sections[i].name == NULL)
+
+  if (type == SHT_PROGBITS)
+    flags |= SEC_ALLOC | SEC_LOAD;
+  else if (type == SHT_NOBITS)
     {
-      if (type == SHT_PROGBITS)
-       flags |= SEC_ALLOC | SEC_LOAD;
-      else if (type == SHT_NOBITS)
-       {
-         flags |= SEC_ALLOC;
-         flags &=~ SEC_LOAD;
-       }
+      flags |= SEC_ALLOC;
+      flags &=~ SEC_LOAD;
+    }
 
 #ifdef md_elf_section_flags
-      flags = md_elf_section_flags (flags, attr, type);
+  if (special_sections[i].name == NULL)
+    flags = md_elf_section_flags (flags, attr, type);
 #endif
-    }
 
   bfd_set_section_flags (stdoutput, sec, flags);