Update Windows, Linux configuration files for nasm 2.15.03rc5

7 files changed, 253 insertions, 172 deletions

diff --git a/README.chromium b/README.chromium
index 28c99a27..14db9b63 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,8 +1,8 @@
 Name: Netwide Assembler
 Short Name: nasm
 URL: https://www.nasm.us/
-Version: 2.15.02rc2 / 8bc18080fe01906d7582a187ea0d67d316501344
-CPEPrefix: cpe:/a:nasm:netwide_assembler:2.15.02rc2
+Version: 2.15.03rc5 / a79a700208d771fb3b8e6e7f03fcc195c2d1831c
+CPEPrefix: cpe:/a:nasm:netwide_assembler:2.15.03rc5
 License: 2-Clause BSD
 License File: LICENSE
 Security Critical: no
@@ -42,8 +42,8 @@ build/Release+Asserts/bin) then do the following:
   # You can safely use git cl upload for all of your own modifications past this
   # point; I.e., once you have pushed all the commits from the git merge.
 
-  CC=clang CXX=clang++ ./autogen.sh
-  CC=clang CXX=clang++ ./configure
+  CC=clang CXX=clang++ CFLAGS="-std=c11 -Werror" ./autogen.sh
+  CC=clang CXX=clang++ CFLAGS="-std=c11 -Werror" ./configure
   make perlreq
   ./generate_nasm_sources.py
   git add <any new .c/.h files which show up>
diff --git a/asm/pptok.c b/asm/pptok.c
index e9e91655..3e0c99af 100644
--- a/asm/pptok.c
+++ b/asm/pptok.c
@@ -88,6 +88,7 @@ const char * const pp_directives[118] = {
     "%include",
     "%line",
     "%local",
+    "%null",
     "%pop",
     "%pragma",
     "%push",
@@ -99,7 +100,6 @@ const char * const pp_directives[118] = {
     "%undefalias",
     "%use",
     "%warning",
-    NULL,
     "%assign",
     "%iassign",
     "%defalias",
@@ -208,6 +208,7 @@ const uint8_t pp_directives_len[118] = {
     8,
     5,
     6,
+    5,
     4,
     7,
     5,
@@ -219,7 +220,6 @@ const uint8_t pp_directives_len[118] = {
     11,
     4,
     8,
-    9,
     7,
     8,
     9,
@@ -268,7 +268,7 @@ enum preproc_token pp_token_hash(const char *token)
         0,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
-        -31,
+        -32,
         0,
         UNUSED_HASH_ENTRY,
         0,
@@ -280,7 +280,7 @@ enum preproc_token pp_token_hash(const char *token)
         UNUSED_HASH_ENTRY,
         -17,
         UNUSED_HASH_ENTRY,
-        -40,
+        -39,
         0,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
@@ -300,8 +300,8 @@ enum preproc_token pp_token_hash(const char *token)
         9,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
-        -25,
-        -27,
+        -26,
+        -28,
         UNUSED_HASH_ENTRY,
         -84,
         124,
@@ -312,7 +312,7 @@ enum preproc_token pp_token_hash(const char *token)
         -79,
         4,
         UNUSED_HASH_ENTRY,
-        -7,
+        -5,
         0,
         UNUSED_HASH_ENTRY,
         36,
@@ -322,42 +322,42 @@ enum preproc_token pp_token_hash(const char *token)
         153,
         83,
         UNUSED_HASH_ENTRY,
-        78,
+        80,
         UNUSED_HASH_ENTRY,
         -68,
         26,
-        27,
+        28,
         57,
         32,
-        96,
+        97,
         -52,
-        98,
+        99,
         UNUSED_HASH_ENTRY,
-        49,
+        48,
         0,
         0,
         41,
-        85,
+        86,
         -107,
         -38,
         0,
         -53,
-        -49,
+        -48,
         UNUSED_HASH_ENTRY,
-        134,
+        135,
         UNUSED_HASH_ENTRY,
         48,
         UNUSED_HASH_ENTRY,
         0,
         39,
         UNUSED_HASH_ENTRY,
-        -85,
+        -84,
         21,
-        60,
+        61,
         UNUSED_HASH_ENTRY,
-        17,
-        15,
-        -63,
+        18,
+        14,
+        -64,
         77,
         UNUSED_HASH_ENTRY,
         -17,
@@ -376,7 +376,7 @@ enum preproc_token pp_token_hash(const char *token)
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
-        90,
+        91,
         7,
         UNUSED_HASH_ENTRY,
     };
@@ -406,7 +406,7 @@ enum preproc_token pp_token_hash(const char *token)
         0,
         0,
         0,
-        77,
+        78,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
@@ -418,11 +418,11 @@ enum preproc_token pp_token_hash(const char *token)
         UNUSED_HASH_ENTRY,
         0,
         97,
-        50,
+        51,
         UNUSED_HASH_ENTRY,
         -55,
         108,
-        125,
+        126,
         0,
         78,
         UNUSED_HASH_ENTRY,
@@ -432,7 +432,7 @@ enum preproc_token pp_token_hash(const char *token)
         UNUSED_HASH_ENTRY,
         0,
         UNUSED_HASH_ENTRY,
-        6,
+        5,
         UNUSED_HASH_ENTRY,
         78,
         UNUSED_HASH_ENTRY,
@@ -442,17 +442,17 @@ enum preproc_token pp_token_hash(const char *token)
         115,
         UNUSED_HASH_ENTRY,
         23,
-        UNUSED_HASH_ENTRY,
+        106,
         58,
-        137,
+        136,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         3,
         94,
         62,
         8,
-        89,
-        119,
+        90,
+        118,
         UNUSED_HASH_ENTRY,
         105,
         27,
@@ -460,24 +460,24 @@ enum preproc_token pp_token_hash(const char *token)
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         19,
-        85,
+        86,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
         16,
         0,
         0,
-        80,
+        81,
         UNUSED_HASH_ENTRY,
         10,
-        100,
+        101,
         UNUSED_HASH_ENTRY,
         52,
         -10,
         139,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
-        140,
+        141,
         11,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
@@ -485,12 +485,12 @@ enum preproc_token pp_token_hash(const char *token)
         111,
         UNUSED_HASH_ENTRY,
         UNUSED_HASH_ENTRY,
-        86,
+        87,
         110,
         113,
         UNUSED_HASH_ENTRY,
-        63,
-        89,
+        64,
+        88,
         0,
         51,
         UNUSED_HASH_ENTRY,
diff --git a/asm/pptok.h b/asm/pptok.h
index 65761725..35bd6ce2 100644
--- a/asm/pptok.h
+++ b/asm/pptok.h
@@ -82,18 +82,18 @@ enum preproc_token {
     PP_INCLUDE               =  77,
     PP_LINE                  =  78,
     PP_LOCAL                 =  79,
-    PP_POP                   =  80,
-    PP_PRAGMA                =  81,
-    PP_PUSH                  =  82,
-    PP_REP                   =  83,
-    PP_REPL                  =  84,
-    PP_ROTATE                =  85,
-    PP_STACKSIZE             =  86,
-    PP_UNDEF                 =  87,
-    PP_UNDEFALIAS            =  88,
-    PP_USE                   =  89,
-    PP_WARNING               =  90,
-    PP_CASE_PAD              =  91,
+    PP_NULL                  =  80,
+    PP_POP                   =  81,
+    PP_PRAGMA                =  82,
+    PP_PUSH                  =  83,
+    PP_REP                   =  84,
+    PP_REPL                  =  85,
+    PP_ROTATE                =  86,
+    PP_STACKSIZE             =  87,
+    PP_UNDEF                 =  88,
+    PP_UNDEFALIAS            =  89,
+    PP_USE                   =  90,
+    PP_WARNING               =  91,
     PP_ASSIGN                =  92,
     PP_IASSIGN               =  93,
     PP_DEFALIAS              =  94,
diff --git a/config/config-linux.h b/config/config-linux.h
index 797fa762..9e59df4f 100644
--- a/config/config-linux.h
+++ b/config/config-linux.h
@@ -31,6 +31,10 @@
 /* Define to 1 if compiled with the `-fsanitize=undefined' compiler flag */
 /* #undef CFLAGS_FSANITIZE_UNDEFINED */
 
+/* Define to 1 if compiled with the `-ftrivial-auto-var-init=zero' compiler
+   flag */
+/* #undef CFLAGS_FTRIVIAL_AUTO_VAR_INIT_ZERO */
+
 /* Define to 1 if compiled with the `-fvisibility=hidden' compiler flag */
 #define CFLAGS_FVISIBILITY_HIDDEN 1
 
@@ -49,6 +53,15 @@
 /* Define to 1 if compiled with the `-pg' compiler flag */
 /* #undef CFLAGS_PG */
 
+/* Define to 1 if compiled with the `-std=c11' compiler flag */
+/* #undef CFLAGS_STD_C11 */
+
+/* Define to 1 if compiled with the `-std=c17' compiler flag */
+#define CFLAGS_STD_C17 1
+
+/* Define to 1 if compiled with the `-std=c99' compiler flag */
+/* #undef CFLAGS_STD_C99 */
+
 /* Define to 1 if compiled with the `-U__STRICT_ANSI__' compiler flag */
 #define CFLAGS_U_STRICT_ANSI 1
 
@@ -59,7 +72,13 @@
 #define CFLAGS_WALL 1
 
 /* Define to 1 if compiled with the `-Wc90-c99-compat' compiler flag */
-#define CFLAGS_WC90_C99_COMPAT 1
+/* #undef CFLAGS_WC90_C99_COMPAT */
+
+/* Define to 1 if compiled with the `-Wc99-compat' compiler flag */
+#define CFLAGS_WC99_COMPAT 1
+
+/* Define to 1 if compiled with the `-Wc99-extensions' compiler flag */
+#define CFLAGS_WC99_EXTENSIONS 1
 
 /* Define to 1 if compiled with the `-Werror' compiler flag */
 /* #undef CFLAGS_WERROR */
@@ -99,7 +118,7 @@
 
 /* Define to 1 if compiled with the `-Werror=unknown-warning-option' compiler
    flag */
-/* #undef CFLAGS_WERROR_UNKNOWN_WARNING_OPTION */
+#define CFLAGS_WERROR_UNKNOWN_WARNING_OPTION 1
 
 /* Define to 1 if compiled with the `-Werror=vla' compiler flag */
 #define CFLAGS_WERROR_VLA 1
@@ -108,13 +127,13 @@
 #define CFLAGS_WLONG_LONG 1
 
 /* Define to 1 if compiled with the `-Wpedantic-ms-format' compiler flag */
-#define CFLAGS_WPEDANTIC_MS_FORMAT 1
+/* #undef CFLAGS_WPEDANTIC_MS_FORMAT */
 
 /* Define to 1 if compiled with the `-Wshift-negative-value' compiler flag */
 #define CFLAGS_WSHIFT_NEGATIVE_VALUE 1
 
 /* Define to 1 if compiled with the `-Wstringop-truncation' compiler flag */
-#define CFLAGS_WSTRINGOP_TRUNCATION 1
+/* #undef CFLAGS_WSTRINGOP_TRUNCATION */
 
 /* Define to 1 if you have the `access' function. */
 #define HAVE_ACCESS 1
@@ -141,7 +160,7 @@
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCPY 1
+#define HAVE_DECL_STRLCPY 0
 
 /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
    don't. */
@@ -226,6 +245,10 @@
    functions */
 #define HAVE_FUNC_ATTRIBUTE_SENTINEL 1
 
+/* Define to 1 if your compiler supports __attribute__((unused)) on functions
+   */
+#define HAVE_FUNC_ATTRIBUTE_UNUSED 1
+
 /* Define to 1 if your compiler supports __attribute__((alloc_size)) on
    function pointers */
 /* #undef HAVE_FUNC_PTR_ATTRIBUTE1_ALLOC_SIZE */
@@ -266,6 +289,10 @@
    pointers */
 /* #undef HAVE_FUNC_PTR_ATTRIBUTE_SENTINEL */
 
+/* Define to 1 if your compiler supports __attribute__((unused)) on function
+   pointers */
+#define HAVE_FUNC_PTR_ATTRIBUTE_UNUSED 1
+
 /* Define to 1 if you have the `getgid' function. */
 #define HAVE_GETGID 1
 
@@ -300,7 +327,7 @@
 #define HAVE_ISASCII 1
 
 /* Define to 1 if you have the `iscntrl' function. */
-#define HAVE_ISCNTRL 1
+/* #undef HAVE_ISCNTRL */
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 /* #undef HAVE_MACHINE_ENDIAN_H */
@@ -320,14 +347,17 @@
 /* Define to 1 if you have the `realpath' function. */
 #define HAVE_REALPATH 1
 
-/* Define to 1 if you have the `snprintf' function. */
+/* Define to 1 if you have some version of the snprintf function. */
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if you have the `stat' function. */
 #define HAVE_STAT 1
 
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
 /* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
+/* #undef HAVE_STDBOOL_H */
 
 /* Define to 1 if your compiler supports C99 extern inline */
 #define HAVE_STDC_INLINE 1
@@ -401,13 +431,16 @@
 /* Define to 1 if you have the `S_ISREG' function. */
 /* #undef HAVE_S_ISREG */
 
+/* Define to 1 if you have some version of the typeof operator. */
+#define HAVE_TYPEOF 1
+
 /* Define to 1 if the system has the type `uintptr_t'. */
 #define HAVE_UINTPTR_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the `vsnprintf' function. */
+/* Define to 1 if you have some version of the vsnprintf function. */
 #define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `_access' function. */
@@ -449,15 +482,9 @@
 /* Define to 1 if you have the `_fullpath' function. */
 /* #undef HAVE__FULLPATH */
 
-/* Define to 1 if you have the `_snprintf' function. */
-/* #undef HAVE__SNPRINTF */
-
 /* Define to 1 if you have the `_stati64' function. */
 /* #undef HAVE__STATI64 */
 
-/* Define to 1 if you have the `_vsnprintf' function. */
-/* #undef HAVE__VSNPRINTF */
-
 /* Define to 1 if you have the `__bswap_16' intrinsic function. */
 #define HAVE___BSWAP_16 1
 
@@ -607,15 +634,27 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
+/* Define if your snprintf function is not named snprintf. */
+/* #undef snprintf */
+
+/* Define if your typeof operator is not named typeof. */
+#define typeof __typeof
+
 /* Define to the type of an unsigned integer type wide enough to hold a
    pointer, if such a type exists, and if the system does not define it. */
 /* #undef uintptr_t */
 
-#ifndef noreturn_func
-# ifdef HAVE_FUNC_ATTRIBUTE_NORETURN
-#  define noreturn_func __attribute__((noreturn))
+/* Define if your vsnprintf function is not named vsnprintf. */
+/* #undef vsnprintf */
+
+
+/* Begin unconfig.h */
+
+#ifndef alloc_size_func2
+# ifdef HAVE_FUNC_ATTRIBUTE2_ALLOC_SIZE
+#  define alloc_size_func2(x1,x2) __attribute__((alloc_size(x1,x2)))
 # else
-#  define noreturn_func
+#  define alloc_size_func2(x1,x2)
 # endif
 #endif
 
@@ -691,19 +730,19 @@
 # endif
 #endif
 
-#ifndef unlikely_func
-# ifdef HAVE_FUNC_ATTRIBUTE_COLD
-#  define unlikely_func __attribute__((cold))
+#ifndef noreturn_func
+# ifdef HAVE_FUNC_ATTRIBUTE_NORETURN
+#  define noreturn_func __attribute__((noreturn))
 # else
-#  define unlikely_func
+#  define noreturn_func
 # endif
 #endif
 
-#ifndef noreturn_func_ptr
-# ifdef HAVE_FUNC_PTR_ATTRIBUTE_NORETURN
-#  define noreturn_func_ptr __attribute__((noreturn))
+#ifndef unlikely_func
+# ifdef HAVE_FUNC_ATTRIBUTE_COLD
+#  define unlikely_func __attribute__((cold))
 # else
-#  define noreturn_func_ptr
+#  define unlikely_func
 # endif
 #endif
 
@@ -715,6 +754,30 @@
 # endif
 #endif
 
+#ifndef unused_func
+# ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
+#  define unused_func __attribute__((unused))
+# else
+#  define unused_func
+# endif
+#endif
+
+#ifndef unused_func_ptr
+# ifdef HAVE_FUNC_PTR_ATTRIBUTE_UNUSED
+#  define unused_func_ptr __attribute__((unused))
+# else
+#  define unused_func_ptr
+# endif
+#endif
+
+#ifndef noreturn_func_ptr
+# ifdef HAVE_FUNC_PTR_ATTRIBUTE_NORETURN
+#  define noreturn_func_ptr __attribute__((noreturn))
+# else
+#  define noreturn_func_ptr
+# endif
+#endif
+
 #ifndef never_null
 # ifdef HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL
 #  define never_null __attribute__((returns_nonnull))
@@ -762,11 +825,3 @@
 #  define alloc_size_func1_ptr(x1)
 # endif
 #endif
-
-#ifndef alloc_size_func2
-# ifdef HAVE_FUNC_ATTRIBUTE2_ALLOC_SIZE
-#  define alloc_size_func2(x1,x2) __attribute__((alloc_size(x1,x2)))
-# else
-#  define alloc_size_func2(x1,x2)
-# endif
-#endif
diff --git a/config/config-win.h b/config/config-win.h
index 7141da77..568312cb 100644
--- a/config/config-win.h
+++ b/config/config-win.h
@@ -8,10 +8,10 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Define to 1 if compiled with the `-fdata-sections' compiler flag */
-#define CFLAGS_FDATA_SECTIONS 1
+/* #undef CFLAGS_FDATA_SECTIONS */
 
 /* Define to 1 if compiled with the `-ffunction-sections' compiler flag */
-#define CFLAGS_FFUNCTION_SECTIONS 1
+/* #undef CFLAGS_FFUNCTION_SECTIONS */
 
 /* Define to 1 if compiled with the `-fgnu89-inline' compiler flag */
 /* #undef CFLAGS_FGNU89_INLINE */
@@ -20,7 +20,7 @@
 /* #undef CFLAGS_FLTO */
 
 /* Define to 1 if compiled with the `-fno-common' compiler flag */
-#define CFLAGS_FNO_COMMON 1
+/* #undef CFLAGS_FNO_COMMON */
 
 /* Define to 1 if compiled with the `-fno-omit-frame-pointer' compiler flag */
 /* #undef CFLAGS_FNO_OMIT_FRAME_POINTER */
@@ -31,11 +31,15 @@
 /* Define to 1 if compiled with the `-fsanitize=undefined' compiler flag */
 /* #undef CFLAGS_FSANITIZE_UNDEFINED */
 
+/* Define to 1 if compiled with the `-ftrivial-auto-var-init=zero' compiler
+   flag */
+/* #undef CFLAGS_FTRIVIAL_AUTO_VAR_INIT_ZERO */
+
 /* Define to 1 if compiled with the `-fvisibility=hidden' compiler flag */
-#define CFLAGS_FVISIBILITY_HIDDEN 1
+/* #undef CFLAGS_FVISIBILITY_HIDDEN */
 
 /* Define to 1 if compiled with the `-fwrapv' compiler flag */
-#define CFLAGS_FWRAPV 1
+/* #undef CFLAGS_FWRAPV */
 
 /* Define to 1 if compiled with the `-ggdb3' compiler flag */
 /* #undef CFLAGS_GGDB3 */
@@ -44,11 +48,20 @@
 /* #undef CFLAGS_O0 */
 
 /* Define to 1 if compiled with the `-pedantic' compiler flag */
-#define CFLAGS_PEDANTIC 1
+/* #undef CFLAGS_PEDANTIC */
 
 /* Define to 1 if compiled with the `-pg' compiler flag */
 /* #undef CFLAGS_PG */
 
+/* Define to 1 if compiled with the `-std=c11' compiler flag */
+/* #undef CFLAGS_STD_C11 */
+
+/* Define to 1 if compiled with the `-std=c17' compiler flag */
+/* #undef CFLAGS_STD_C17 */
+
+/* Define to 1 if compiled with the `-std=c99' compiler flag */
+/* #undef CFLAGS_STD_C99 */
+
 /* Define to 1 if compiled with the `-U__STRICT_ANSI__' compiler flag */
 #define CFLAGS_U_STRICT_ANSI 1
 
@@ -56,7 +69,7 @@
 #define CFLAGS_W 1
 
 /* Define to 1 if compiled with the `-Wall' compiler flag */
-#define CFLAGS_WALL 1
+/* #undef CFLAGS_WALL */
 
 /* Define to 1 if compiled with the `-Wc90-c99-compat' compiler flag */
 /* #undef CFLAGS_WC90_C99_COMPAT */
@@ -139,23 +152,23 @@
 
 /* Define to 1 if you have the declaration of `strcasecmp', and to 0 if you
    don't. */
-#define HAVE_DECL_STRCASECMP 1
+#define HAVE_DECL_STRCASECMP 0
 
 /* Define to 1 if you have the declaration of `stricmp', and to 0 if you
    don't. */
-#define HAVE_DECL_STRICMP 1
+#define HAVE_DECL_STRICMP 0
 
 /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
    don't. */
-#define HAVE_DECL_STRLCPY 1
+#define HAVE_DECL_STRLCPY 0
 
 /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
    don't. */
-#define HAVE_DECL_STRNCASECMP 1
+#define HAVE_DECL_STRNCASECMP 0
 
 /* Define to 1 if you have the declaration of `strnicmp', and to 0 if you
    don't. */
-#define HAVE_DECL_STRNICMP 1
+#define HAVE_DECL_STRNICMP 0
 
 /* Define to 1 if you have the declaration of `strnlen', and to 0 if you
    don't. */
@@ -314,7 +327,7 @@
 /* #undef HAVE_ISASCII */
 
 /* Define to 1 if you have the `iscntrl' function. */
-#define HAVE_ISCNTRL 1
+/* #undef HAVE_ISCNTRL */
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 /* #undef HAVE_MACHINE_ENDIAN_H */
@@ -334,14 +347,17 @@
 /* Define to 1 if you have the `realpath' function. */
 /* #undef HAVE_REALPATH */
 
-/* Define to 1 if you have the `snprintf' function. */
+/* Define to 1 if you have some version of the snprintf function. */
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if you have the `stat' function. */
 #define HAVE_STAT 1
 
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
 /* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
+/* #undef HAVE_STDBOOL_H */
 
 /* Define to 1 if your compiler supports C99 extern inline */
 #define HAVE_STDC_INLINE 1
@@ -415,13 +431,16 @@
 /* Define to 1 if you have the `S_ISREG' function. */
 /* #undef HAVE_S_ISREG */
 
+/* Define to 1 if you have some version of the typeof operator. */
+#define HAVE_TYPEOF 1
+
 /* Define to 1 if the system has the type `uintptr_t'. */
 #define HAVE_UINTPTR_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
-/* Define to 1 if you have the `vsnprintf' function. */
+/* Define to 1 if you have some version of the vsnprintf function. */
 #define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `_access' function. */
@@ -463,15 +482,9 @@
 /* Define to 1 if you have the `_fullpath' function. */
 #define HAVE__FULLPATH 1
 
-/* Define to 1 if you have the `_snprintf' function. */
-/* #undef HAVE__SNPRINTF */
-
 /* Define to 1 if you have the `_stati64' function. */
 #define HAVE__STATI64 1
 
-/* Define to 1 if you have the `_vsnprintf' function. */
-/* #undef HAVE__VSNPRINTF */
-
 /* Define to 1 if you have the `__bswap_16' intrinsic function. */
 /* #undef HAVE___BSWAP_16 */
 
@@ -621,15 +634,27 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
+/* Define if your snprintf function is not named snprintf. */
+/* #undef snprintf */
+
+/* Define if your typeof operator is not named typeof. */
+/* #undef typeof */
+
 /* Define to the type of an unsigned integer type wide enough to hold a
    pointer, if such a type exists, and if the system does not define it. */
 /* #undef uintptr_t */
 
-#ifndef noreturn_func
-# ifdef HAVE_FUNC_ATTRIBUTE_NORETURN
-#  define noreturn_func __attribute__((noreturn))
+/* Define if your vsnprintf function is not named vsnprintf. */
+/* #undef vsnprintf */
+
+
+/* Begin unconfig.h */
+
+#ifndef alloc_size_func2
+# ifdef HAVE_FUNC_ATTRIBUTE2_ALLOC_SIZE
+#  define alloc_size_func2(x1,x2) __attribute__((alloc_size(x1,x2)))
 # else
-#  define noreturn_func
+#  define alloc_size_func2(x1,x2)
 # endif
 #endif
 
@@ -705,19 +730,19 @@
 # endif
 #endif
 
-#ifndef unlikely_func
-# ifdef HAVE_FUNC_ATTRIBUTE_COLD
-#  define unlikely_func __attribute__((cold))
+#ifndef noreturn_func
+# ifdef HAVE_FUNC_ATTRIBUTE_NORETURN
+#  define noreturn_func __attribute__((noreturn))
 # else
-#  define unlikely_func
+#  define noreturn_func
 # endif
 #endif
 
-#ifndef noreturn_func_ptr
-# ifdef HAVE_FUNC_PTR_ATTRIBUTE_NORETURN
-#  define noreturn_func_ptr __attribute__((noreturn))
+#ifndef unlikely_func
+# ifdef HAVE_FUNC_ATTRIBUTE_COLD
+#  define unlikely_func __attribute__((cold))
 # else
-#  define noreturn_func_ptr
+#  define unlikely_func
 # endif
 #endif
 
@@ -745,6 +770,14 @@
 # endif
 #endif
 
+#ifndef noreturn_func_ptr
+# ifdef HAVE_FUNC_PTR_ATTRIBUTE_NORETURN
+#  define noreturn_func_ptr __attribute__((noreturn))
+# else
+#  define noreturn_func_ptr
+# endif
+#endif
+
 #ifndef never_null
 # ifdef HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL
 #  define never_null __attribute__((returns_nonnull))
@@ -792,11 +825,3 @@
 #  define alloc_size_func1_ptr(x1)
 # endif
 #endif
-
-#ifndef alloc_size_func2
-# ifdef HAVE_FUNC_ATTRIBUTE2_ALLOC_SIZE
-#  define alloc_size_func2(x1,x2) __attribute__((alloc_size(x1,x2)))
-# else
-#  define alloc_size_func2(x1,x2)
-# endif
-#endif
diff --git a/macros/macros.c b/macros/macros.c
index 20fc4bf9..cb48b249 100644
--- a/macros/macros.c
+++ b/macros/macros.c
@@ -100,17 +100,18 @@
 #define p_include                205
 #define p_line                   206
 #define p_local                  207
-#define p_pop                    208
-#define p_pragma                 209
-#define p_push                   210
-#define p_rep                    211
-#define p_repl                   212
-#define p_rotate                 213
-#define p_stacksize              214
-#define p_undef                  215
-#define p_undefalias             216
-#define p_use                    217
-#define p_warning                218
+#define p_null                   208
+#define p_pop                    209
+#define p_pragma                 210
+#define p_push                   211
+#define p_rep                    212
+#define p_repl                   213
+#define p_rotate                 214
+#define p_stacksize              215
+#define p_undef                  216
+#define p_undefalias             217
+#define p_use                    218
+#define p_warning                219
 #define p_assign                 220
 #define p_iassign                221
 #define p_defalias               222
@@ -145,10 +146,10 @@ const unsigned char nasm_stdmac_version[] = {
     /* From version.mac */
         /*    0 */ p_define,'_','_','?','N','A','S','M','_','M','A','J','O','R','?','_','_',' ','2',EOL,
         /*   20 */ p_define,'_','_','?','N','A','S','M','_','M','I','N','O','R','?','_','_',' ','1','5',EOL,
-        /*   41 */ p_define,'_','_','?','N','A','S','M','_','S','U','B','M','I','N','O','R','?','_','_',' ','1',EOL,
-        /*   64 */ p_define,'_','_','?','N','A','S','M','_','P','A','T','C','H','L','E','V','E','L','?','_','_',' ','9','2',EOL,
-        /*   90 */ p_define,'_','_','?','N','A','S','M','_','V','E','R','S','I','O','N','_','I','D','?','_','_',' ','0','0','2','0','F','0','1','5','C','h',EOL,
-        /*  124 */ p_define,'_','_','?','N','A','S','M','_','V','E','R','?','_','_',' ','\"','2','.','1','5','.','0','2','r','c','2','\"',EOL,
+        /*   41 */ p_define,'_','_','?','N','A','S','M','_','S','U','B','M','I','N','O','R','?','_','_',' ','2',EOL,
+        /*   64 */ p_define,'_','_','?','N','A','S','M','_','P','A','T','C','H','L','E','V','E','L','?','_','_',' ','9','5',EOL,
+        /*   90 */ p_define,'_','_','?','N','A','S','M','_','V','E','R','S','I','O','N','_','I','D','?','_','_',' ','0','0','2','0','F','0','2','5','F','h',EOL,
+        /*  124 */ p_define,'_','_','?','N','A','S','M','_','V','E','R','?','_','_',' ','\"','2','.','1','5','.','0','3','r','c','5','\"',EOL,
         /*  153 */ EOL
 };
 #endif
@@ -262,30 +263,30 @@ static const unsigned char nasm_usemac_masm[] = {
         /*   90 */ '_','_','?','S','E','C','T','?','_','_',EOL,
         /*  101 */ p_endmacro,EOL,
         /*  103 */ p_imacro,'e','n','d','s',' ','0','+','.','n','o','l','i','s','t',EOL,
-        /*  119 */ p_pragma,'i','g','n','o','r','e',' ','e','n','d','s',' ','%','0','0',EOL,
-        /*  136 */ p_endmacro,EOL,
-        /*  138 */ p_imacro,'p','r','o','c',' ','0','-','*','.','n','o','l','i','s','t',EOL,
-        /*  155 */ p_rep,'%','0',EOL,
-        /*  159 */ p_ifidni,'%','1',',','f','a','r',EOL,
-        /*  167 */ p_idefine,'r','e','t',' ','r','e','t','f',EOL,
-        /*  177 */ p_else,EOL,
-        /*  179 */ p_idefine,'r','e','t',' ','r','e','t','n',EOL,
-        /*  189 */ p_endif,EOL,
-        /*  191 */ p_rotate,'1',EOL,
-        /*  194 */ p_endrep,EOL,
-        /*  196 */ p_endmacro,EOL,
-        /*  198 */ p_imacro,'e','n','d','p',' ','0','.','n','o','l','i','s','t',EOL,
-        /*  213 */ p_pragma,'i','g','n','o','r','e',' ','e','n','d','p',' ','%','0','0',EOL,
-        /*  230 */ p_undef,'r','e','t',EOL,
-        /*  235 */ p_endmacro,EOL,
-        /*  237 */ p_idefine,'p','t','r',' ','_','_','?','m','a','s','m','_','p','t','r','?','_','_',EOL,
-        /*  257 */ p_idefine,'f','l','a','t',' ','_','_','?','m','a','s','m','_','f','l','a','t','?','_','_',EOL,
-        /*  279 */ p_idefine,'o','f','f','s','e','t',EOL,
-        /*  287 */ p_imacro,'e','n','d',' ','0','+','.','n','o','l','i','s','t',EOL,
-        /*  302 */ p_endmacro,EOL,
-        /*  304 */ p_idefine,'t','b','y','t','e',' ','t','w','o','r','d',EOL,
-        /*  317 */ 'd','e','f','a','u','l','t',' ','r','e','l',EOL,
-        /*  329 */ EOL
+        /*  119 */ p_null,'e','n','d','s',' ','%','0','0',EOL,
+        /*  129 */ p_endmacro,EOL,
+        /*  131 */ p_imacro,'p','r','o','c',' ','0','-','*','.','n','o','l','i','s','t',EOL,
+        /*  148 */ p_rep,'%','0',EOL,
+        /*  152 */ p_ifidni,'%','1',',','f','a','r',EOL,
+        /*  160 */ p_idefine,'r','e','t',' ','r','e','t','f',EOL,
+        /*  170 */ p_else,EOL,
+        /*  172 */ p_idefine,'r','e','t',' ','r','e','t','n',EOL,
+        /*  182 */ p_endif,EOL,
+        /*  184 */ p_rotate,'1',EOL,
+        /*  187 */ p_endrep,EOL,
+        /*  189 */ p_endmacro,EOL,
+        /*  191 */ p_imacro,'e','n','d','p',' ','0','.','n','o','l','i','s','t',EOL,
+        /*  206 */ p_null,'e','n','d','p',' ','%','0','0',EOL,
+        /*  216 */ p_undef,'r','e','t',EOL,
+        /*  221 */ p_endmacro,EOL,
+        /*  223 */ p_idefine,'p','t','r',' ','_','_','?','m','a','s','m','_','p','t','r','?','_','_',EOL,
+        /*  243 */ p_idefine,'f','l','a','t',' ','_','_','?','m','a','s','m','_','f','l','a','t','?','_','_',EOL,
+        /*  265 */ p_idefine,'o','f','f','s','e','t',EOL,
+        /*  273 */ p_imacro,'e','n','d',' ','0','+','.','n','o','l','i','s','t',EOL,
+        /*  288 */ p_endmacro,EOL,
+        /*  290 */ p_idefine,'t','b','y','t','e',' ','t','w','o','r','d',EOL,
+        /*  303 */ 'd','e','f','a','u','l','t',' ','r','e','l',EOL,
+        /*  315 */ EOL
 };
 #endif
 
diff --git a/version.h b/version.h
index 6b492fbf..de4c0f6d 100644
--- a/version.h
+++ b/version.h
@@ -2,8 +2,8 @@
 #define NASM_VERSION_H
 #define NASM_MAJOR_VER      2
 #define NASM_MINOR_VER      15
-#define NASM_SUBMINOR_VER   1
-#define NASM_PATCHLEVEL_VER 92
-#define NASM_VERSION_ID     0x020f015c
-#define NASM_VER            "2.15.02rc2"
+#define NASM_SUBMINOR_VER   2
+#define NASM_PATCHLEVEL_VER 95
+#define NASM_VERSION_ID     0x020f025f
+#define NASM_VER            "2.15.03rc5"
 #endif /* NASM_VERSION_H */