From 57b3ba3506c2def914394b24e7a597d170be6198 Mon Sep 17 00:00:00 2001
From: Sergey <serge@vak.ru>
Date: Sun, 21 Jun 2015 17:05:04 -0700
Subject: [PATCH] Fixed .equ syntax in assembler.

---
 src/cmd/as/as.c | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/cmd/as/as.c b/src/cmd/as/as.c
index 931486a..61a3e7e 100644
--- a/src/cmd/as/as.c
+++ b/src/cmd/as/as.c
@@ -1987,7 +1987,7 @@ void pass1 ()
                 stab[cval].n_type &= ~N_TYPE;
                 stab[cval].n_type |= segmtype [segm];
                 continue;
-            } else if (clex=='=' || clex==LEQU) {
+            } else if (clex=='=') {
                 /* Symbol definition. */
                 cval = lookname();
                 stab[cval].n_value = getexpr (&csegm);
@@ -1996,22 +1996,6 @@ void pass1 ()
                 stab[cval].n_type &= N_EXT;
                 stab[cval].n_type |= segmtype [csegm];
                 break;
-            } else if (clex==LCOMM) {
-                /* name .comm len */
-                cval = lookname();
-                if (stab[cval].n_type != N_UNDF &&
-                    stab[cval].n_type != N_LOC &&
-                    (stab[cval].n_type & N_TYPE) != N_COMM)
-                    uerror ("name already defined");
-                if (stab[cval].n_type & N_LOC)
-                    stab[cval].n_type = N_COMM;
-                else
-                    stab[cval].n_type = N_EXT | N_COMM;
-                getexpr (&tval);
-                if (tval != SABS)
-                    uerror ("bad .comm length");
-                stab[cval].n_value = intval;
-                break;
             }
             /* Machine instruction. */
             if (cval < 0)
@@ -2165,6 +2149,24 @@ void pass1 ()
                 }
             }
             break;
+        case LEQU:
+            /* .equ name,value */
+            if (getlex (&cval) != LNAME)
+                uerror ("bad parameter of .equ");
+            cval = lookname();
+            if (stab[cval].n_type != N_UNDF &&
+                stab[cval].n_type != N_LOC &&
+                (stab[cval].n_type & N_TYPE) != N_COMM)
+                uerror ("name already defined");
+            clex = getlex (&tval);
+            if (clex != ',')
+                uerror ("bad value of .equ");
+            stab[cval].n_value = getexpr (&csegm);
+            if (csegm == SEXT)
+                uerror ("indirect equivalence");
+            stab[cval].n_type &= N_EXT;
+            stab[cval].n_type |= segmtype [csegm];
+            break;
         case LCOMM:
             /* .comm name,len[,alignment] */
             if (getlex (&cval) != LNAME)