Allow multiple EXTERN's of same variable without error (NASM's behavior).

svn path=/trunk/yasm/; revision=354

diff --git a/libyasm/symrec.c b/libyasm/symrec.c
index 243391e7903cebd3219e6aaf21c50c507c1aefbb..c426f5f436645211aaf8675f64758bcb70368c8b 100644 (file)
--- a/libyasm/symrec.c
+++ b/libyasm/symrec.c
@@ -162,7 +162,7 @@ symrec_declare(const char *name, SymVisibility vis)
 
     /* Don't allow EXTERN and COMMON if symbol has already been DEFINED. */
     /* Also, EXTERN and COMMON are mutually exclusive. */
-    if ((rec->status & SYM_DEFINED) ||
+    if (((rec->status & SYM_DEFINED) && !(rec->visibility & SYM_EXTERN)) ||
        ((rec->visibility & SYM_COMMON) && (vis == SYM_EXTERN)) ||
        ((rec->visibility & SYM_EXTERN) && (vis == SYM_COMMON))) {
        Error(_("duplicate definition of `%s'; first defined on line %d"),

diff --git a/src/symrec.c b/src/symrec.c
index 243391e7903cebd3219e6aaf21c50c507c1aefbb..c426f5f436645211aaf8675f64758bcb70368c8b 100644 (file)
--- a/src/symrec.c
+++ b/src/symrec.c
@@ -162,7 +162,7 @@ symrec_declare(const char *name, SymVisibility vis)
 
     /* Don't allow EXTERN and COMMON if symbol has already been DEFINED. */
     /* Also, EXTERN and COMMON are mutually exclusive. */
-    if ((rec->status & SYM_DEFINED) ||
+    if (((rec->status & SYM_DEFINED) && !(rec->visibility & SYM_EXTERN)) ||
        ((rec->visibility & SYM_COMMON) && (vis == SYM_EXTERN)) ||
        ((rec->visibility & SYM_EXTERN) && (vis == SYM_COMMON))) {
        Error(_("duplicate definition of `%s'; first defined on line %d"),

diff --git a/tests/nasm/multiext.asm b/tests/nasm/multiext.asm
new file mode 100644 (file)
index 0000000..2845428
--- /dev/null
+++ b/tests/nasm/multiext.asm
@@ -0,0 +1,2 @@
+[extern blah]
+[extern blah]