Merge branch 'nasm-2.12.xx'

Resolved Conflicts:
	configure.in
	output/codeview.c

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

configure.in

@@ -75,6 +75,10 @@ AH_TEMPLATE(WORDS_LITTLEENDIAN,
 [Define to 1 if your processor stores words with the least significant
 byte first (like Intel and VAX, unlike Motorola and SPARC).])
 
+dnl Force gcc and gcc-compatible compilers treat signed integers
+dnl as 2's complement
+PA_ADD_CFLAGS([-fwrapv])
+
 dnl Look for programs...
 AC_CHECK_PROGS(NROFF,    nroff,    false)
 AC_CHECK_PROGS(ASCIIDOC, asciidoc, false)
@@ -180,9 +184,10 @@ AC_ARG_ENABLE([ccache],
 [CC="ccache $CC"],
 [])
 
-dnl If we have gcc, add appropriate options
+dnl If we have gcc, add appropriate code cleanliness options
 PA_ADD_CFLAGS([-W])
 PA_ADD_CFLAGS([-Wall])
+PA_ADD_CFLAGS([-std=c99])
 PA_ADD_CFLAGS([-pedantic])
 AC_ARG_ENABLE([werror],
 [AC_HELP_STRING([--enable-werror],

md5.h

@@ -1,7 +1,7 @@
 #ifndef _MD5_H_
 #define _MD5_H_
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #define MD5_HASHBYTES 16
 

nasm.c

@@ -807,9 +807,6 @@ static bool process_arg(char *p, char *q)
                  "--prefix,--postfix\n"
                  "  this options prepend or append the given argument to all\n"
                  "  extern and global variables\n"
-                 "--allow-64-bit\n"
-                 "  do not restrict 64-bit code to 64-bit capable output\n"
-                 "  formats (use with care, no complaining)\n\n"
                  "Warnings:\n");
             for (i = 0; i <= ERR_WARN_MAX; i++)
                 printf("    %-23s %s (default %s)\n",

output/codeview.c

@@ -59,15 +59,15 @@ static void cv8_output(int type, void *param);
 static void cv8_cleanup(void);
 
 const struct dfmt df_cv8 = {
-    .fullname = "Codeview 8",
-    .shortname = "cv8",
-    .init = cv8_init,
-    .linenum = cv8_linenum,
-    .debug_deflabel = cv8_deflabel,
-    .debug_directive = null_debug_directive,
-    .debug_typevalue = cv8_typevalue,
-    .debug_output = cv8_output,
-    .cleanup = cv8_cleanup,
+    "Codeview 8",               /* .fullname */
+    "cv8",                      /* .shortname */
+    cv8_init,                   /* .init */
+    cv8_linenum,                /* .linenum */
+    cv8_deflabel,               /* .debug_deflabel */
+    null_debug_directive,       /* .debug_directive */
+    cv8_typevalue,              /* .debug_typevalue */
+    cv8_output,                 /* .debug_output */
+    cv8_cleanup,                /* .cleanup */
 };
 
 /*******************************************************************************