* config/tc-mips.c (md_longopts): Rename mips-16 to mips16, and

	no-mips-16 to no-mips16.
	(s_mipsset): Accept .set mips16 and .set nomips16.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e92cd9def5eeb21835294c9be5857daa6dc63864..5bf1f85f1b18d36db37f194dba28a74b1efe4f61 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec  4 13:00:07 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * config/tc-mips.c (md_longopts): Rename mips-16 to mips16, and
+       no-mips-16 to no-mips16.
+       (s_mipsset): Accept .set mips16 and .set nomips16.
+
 Wed Dec  4 10:35:33 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
        * config/tc-ppc.c (ppc_elf_suffix): Take expressionS pointer

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index e8761bdb862d1ff714b0d2a5bbcfe8b4484e4b06..3d3eed6a76f14de8a9729a23b24efb7b0e378e03 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -7465,9 +7465,9 @@ struct option md_longopts[] = {
 #define OPTION_NO_M4100 (OPTION_MD_BASE + 18)
   {"no-m4100", no_argument, NULL, OPTION_NO_M4100},
 #define OPTION_MIPS16 (OPTION_MD_BASE + 22)
-  {"mips-16", no_argument, NULL, OPTION_MIPS16},
+  {"mips16", no_argument, NULL, OPTION_MIPS16},
 #define OPTION_NO_MIPS16 (OPTION_MD_BASE + 23)
-  {"no-mips-16", no_argument, NULL, OPTION_NO_MIPS16},
+  {"no-mips16", no_argument, NULL, OPTION_NO_MIPS16},
 
 #define OPTION_CALL_SHARED (OPTION_MD_BASE + 7)
 #define OPTION_NON_SHARED (OPTION_MD_BASE + 8)
@@ -8672,6 +8672,12 @@ s_mipsset (x)
     {
       mips_nobopt = 1;
     }
+  else if (strcmp (name, "mips16") == 0
+          || strcmp (name, "MIPS-16") == 0)
+    mips16 = 1;
+  else if (strcmp (name, "nomips16") == 0
+          || strcmp (name, "noMIPS-16") == 0)
+    mips16 = 0;
   else if (strncmp (name, "mips", 4) == 0)
     {
       int isa;
@@ -8686,10 +8692,6 @@ s_mipsset (x)
       else
        mips_isa = isa;
     }
-  else if (strcmp (name, "MIPS-16") == 0)
-    mips16 = 1;
-  else if (strcmp (name, "noMIPS-16") == 0)
-    mips16 = 0;
   else if (strcmp (name, "autoextend") == 0)
     mips16_autoextend = 1;
   else if (strcmp (name, "noautoextend") == 0)
@@ -8922,8 +8924,8 @@ md_section_align (seg, addr)
   /* We don't need to align ELF sections to the full alignment.
      However, Irix 5 may prefer that we align them at least to a 16
      byte boundary.  */
-  if (align > 16)
-    align = 16;
+  if (align > 4)
+    align = 4;
 #endif
 
   return ((addr + (1 << align) - 1) & (-1 << align));