NASM 0.98.20

diff --git a/nasm.c b/nasm.c
index 5479a73969d317aef117685a18daa486f919ea22..14ef45bcbecf446d5cc85805324cc46824ca182c 100644 (file)
--- a/nasm.c
+++ b/nasm.c
@@ -819,7 +819,7 @@ static void assemble_file (char *fname)
                            *q++ = '\0';
                            ofmt->symdef(value, 0L, 0L, 3, q);
                         }
-                  } else if (pass0 == 1) {   /* pass == 1 */
+                  } else if (pass == 1) {   /* pass == 1 */
                         q = value;
                         validid = TRUE;
                         if (!isidstart(*q))
@@ -840,9 +840,12 @@ static void assemble_file (char *fname)
                         } else
                            special = NULL;
                         if (!is_extern(value)) {   /* allow re-EXTERN to be ignored */
+                           int temp = pass0;
+                           pass0 = 1;  /* fake pass 1 in labels.c */
                            declare_as_global (value, special, report_error);
                            define_label (value, seg_alloc(), 0L, NULL, FALSE, TRUE,
                                           ofmt, report_error);
+                           pass0 = temp;
                         }
                   } /* else  pass0 == 1 */
                   break;

diff --git a/nasm.h b/nasm.h
index 3ad5bb470e8af996d93022146518fd0b6b51fcf1..1ec58a309f86fffac65b5c17f7e1e21ebcf769db 100644 (file)
--- a/nasm.h
+++ b/nasm.h
@@ -13,7 +13,7 @@
 
 #define NASM_MAJOR_VER 0
 #define NASM_MINOR_VER 98
-#define NASM_VER "0.98.19"
+#define NASM_VER "0.98.20"
 
 #ifndef NULL
 #define NULL 0