Merge branch 'mkwarnings'

Resolved conflicts:
	asm/nasm.c

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/nasmlib/readnum.c b/nasmlib/readnum.c
index 02e30830..4e73c1a1 100644
--- a/nasmlib/readnum.c
+++ b/nasmlib/readnum.c
@@ -163,10 +163,16 @@ int64_t readnum(const char *str, bool *error)
         r++;
     }
 
-    if (warn)
+    if (warn) {
+        /*!
+         *!number-overflow [on] numeric constant does not fit
+         *!    covers warnings about numeric constants which
+         *!    don't fit in 64 bits.
+         */
         nasm_error(ERR_WARNING | ERR_PASS1 | WARN_NUMBER_OVERFLOW,
 		   "numeric constant %s does not fit in 64 bits",
 		   str);
+    }
 
     return result * sign;
 }