usr.bin/as: Recognize MIPS ".module" directive.

The .module directive, added to binutils gas in 2014, allows command line options to be set in the assembler source code. Recognize and parse, but ignore, the ".module" directive. This allows MIPS assembler generated by newer versions of gcc to be recognized, and not fail on the .module directive. The format recognized is ".module name[=name]". E.g., ".module fp=32" ".module oddspreg" ".module arch=mips32r2" The /tools/aoututils version has also been changed, to keep in sync.
chettrick · Feb 24, 2024 · a6de7b1 · a6de7b1
1 parent 1746e10
commit a6de7b1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/tools/aoututils/as/as.c b/tools/aoututils/as/as.c
@@ -84,6 +84,7 @@ enum {
     LWEAK,              /* .weak */
     LLOCAL,             /* .local */
     LNAN,               /* .nan */
+    LMODULE,            /* .module */
 };
 
 /*
@@ -733,6 +734,7 @@ int lookacmd ()
         break;
     case 'm':
         if (! strcmp (".mask", name)) return (LMASK);
+        if (! strcmp (".module", name)) return (LMODULE);
         break;
     case 'n':
         if (! strcmp (".nan", name)) return (LNAN);
@@ -2349,6 +2351,20 @@ done:       reorder_flush();
             if (csegm != SABS)
                 uerror ("bad value of .size");
             break;
+        case LMODULE:
+            /* .module name[=name] */
+            clex = getlex (&cval);
+            if (clex != LNAME)
+                uerror ("bad parameter of .module");
+            clex = getlex (&cval);
+            if (clex != '=') {
+                ungetlex (clex, cval);
+                break;
+            }
+            clex = getlex (&cval);
+            if (clex != LNAME)
+                uerror ("bad parameter of .module");
+            break;
         default:
             uerror ("bad syntax");
         }

diff --git a/usr.bin/as/as.c b/usr.bin/as/as.c
@@ -84,6 +84,7 @@ enum {
     LWEAK,              /* .weak */
     LLOCAL,             /* .local */
     LNAN,               /* .nan */
+    LMODULE,            /* .module */
 };
 
 /*
@@ -733,6 +734,7 @@ int lookacmd ()
         break;
     case 'm':
         if (! strcmp (".mask", name)) return (LMASK);
+        if (! strcmp (".module", name)) return (LMODULE);
         break;
     case 'n':
         if (! strcmp (".nan", name)) return (LNAN);
@@ -2349,6 +2351,20 @@ done:       reorder_flush();
             if (csegm != SABS)
                 uerror ("bad value of .size");
             break;
+        case LMODULE:
+            /* .module name[=name] */
+            clex = getlex (&cval);
+            if (clex != LNAME)
+                uerror ("bad parameter of .module");
+            clex = getlex (&cval);
+            if (clex != '=') {
+                ungetlex (clex, cval);
+                break;
+            }
+            clex = getlex (&cval);
+            if (clex != LNAME)
+                uerror ("bad parameter of .module");
+            break;
         default:
             uerror ("bad syntax");
         }