7 files changed, 36 insertions, 16 deletions
diff --git a/groups.d/030.host_toolchain.group b/groups.d/030.host_toolchain.group
index 220b07ef..0e2372eb 100644
--- a/groups.d/030.host_toolchain.group
+++ b/groups.d/030.host_toolchain.group
@@ -131,8 +131,8 @@ HOST_TOOLCHAIN_RPM_DISABLE=1;
 : ${PKG_MUSL_NO_COMPLEX_HOST_INSTALL_FILES_V2:="-=include/iconv.h"};
 : ${PKG_MUSL_NO_COMPLEX_HOST_SUBDIR:=musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION}};
 : ${PKG_MUSL_NO_COMPLEX_HOST_VARS_FILE:="vars/musl.vars"};
-: ${PKG_NASM_HOST_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5};
-: ${PKG_NASM_HOST_VERSION:=2.14.02};
+: ${PKG_NASM_HOST_SHA256SUM:=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558};
+: ${PKG_NASM_HOST_VERSION:=2.16.01};
 : ${PKG_NASM_HOST_URL:=http://www.nasm.us/pub/nasm/releasebuilds/${PKG_NASM_HOST_VERSION}/nasm-${PKG_NASM_HOST_VERSION}.tar.xz};
 : ${PKG_NASM_HOST_CFLAGS_CONFIGURE_EXTRA:=-DCOFF_MIDIPIX};
 : ${PKG_NASM_HOST_INSTALL_FILES_V2:="!bin/%<*>=bin/%[_target]-%[FNAME]"};
diff --git a/groups.d/221.native_packages_dev.group b/groups.d/221.native_packages_dev.group
index 9f6d2b8e..801e5d4f 100644
--- a/groups.d/221.native_packages_dev.group
+++ b/groups.d/221.native_packages_dev.group
@@ -115,8 +115,8 @@ make_cv_synchronous_posix_spawn=yes"};
 : ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA_LIST:="CC=${DEFAULT_NATIVE_CC}:CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib:LDADD=-Wl,-lz,-lfts:HAVE_REALLOCARRAY=0"};
 : ${PKG_MANDOC_CFLAGS_BUILD_EXTRA:="-g3 -O0"};
 : ${PKG_MANDOC_IN_TREE:=1};
-: ${PKG_NASM_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5};
-: ${PKG_NASM_VERSION:=2.14.02};
+: ${PKG_NASM_SHA256SUM:=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558};
+: ${PKG_NASM_VERSION:=2.16.01};
 : ${PKG_NASM_URL:=http://www.nasm.us/pub/nasm/releasebuilds/${PKG_NASM_VERSION}/nasm-${PKG_NASM_VERSION}.tar.xz};
 : ${PKG_NASM_CFLAGS_CONFIGURE_EXTRA:=-DCOFF_MIDIPIX};
 : ${PKG_PATCH_SHA256SUM:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd};
diff --git a/patches/nasm-2.14.02.local.patch b/patches/nasm-2.14.02.local.patch
deleted file mode 120000
index 0a3acf14..00000000
--- a/patches/nasm-2.14.02.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-nasm_host-2.14.02.local.patch
-\ No newline at end of file
diff --git a/patches/nasm-2.16.01.local.patch b/patches/nasm-2.16.01.local.patch
new file mode 120000
index 00000000..b2cff0eb
--- /dev/null
+++ b/patches/nasm-2.16.01.local.patch
@@ -0,0 +1 @@
+nasm_host-2.16.01.local.patch
+\ No newline at end of file
diff --git a/patches/nasm_host-2.14.02.local.patch b/patches/nasm_host-2.16.01.local.patch
index defc369b..5e61a289 100644
--- a/patches/nasm_host-2.14.02.local.patch
+++ b/patches/nasm_host-2.16.01.local.patch
@@ -1,6 +1,8 @@
---- nasm-2.14.02/output/outcoff.c.orig	2018-12-26 13:44:06.000000000 +0000
-+++ nasm-2.14.02/output/outcoff.c	2019-01-20 13:18:06.240000000 +0000
-@@ -701,6 +701,7 @@
+diff --git nasm-2.16.01/output/outcoff.c.orig nasm-2.16.01/output/outcoff.c
+index c2b4eb6..fc57c1e 100644
+--- nasm-2.16.01/output/outcoff.c.orig
++++ nasm-2.16.01/output/outcoff.c
+@@ -820,6 +820,7 @@ static void coff_sect_write(struct coff_Section *sect,
      sect->len += len;
  }
  
@@ -8,7 +10,7 @@
  typedef struct tagString {
      struct tagString *next;
      int len;
-@@ -765,6 +766,98 @@
+@@ -884,6 +885,98 @@ static void BuildExportTable(STRING **rvp)
  
      *rvp = NULL;
  }
@@ -105,10 +107,10 @@
 +}
 +#endif
  
- static enum directive_result
- coff_directives(enum directive directive, char *value, int pass)
-@@ -793,7 +886,9 @@
-             nasm_error(ERR_NONFATAL, "unrecognized export qualifier `%s'", q);
+ static void coff_defcomdatname(char *name, int32_t segment)
+ {
+@@ -924,7 +1017,9 @@ coff_directives(enum directive directive, char *value)
+             nasm_nonfatal("unrecognized export qualifier `%s'", q);
              return DIRR_ERROR;
          }
 +#ifndef COFF_MIDIPIX
@@ -117,7 +119,7 @@
          return DIRR_OK;
      }
      case D_SAFESEH:
-@@ -888,8 +983,12 @@
+@@ -1039,8 +1134,12 @@ static void coff_write(void)
      int32_t pos, sympos, vsize;
      int i;
  
@@ -130,7 +132,7 @@
  
      if (win32) {
          /* add default value for @feat.00, this allows to 'link /safeseh' */
-@@ -1086,7 +1185,10 @@
+@@ -1278,7 +1377,10 @@ static void coff_write_symbols(void)
      memset(filename, 0, 18);    /* useful zeroed buffer */
  
      for (i = 0; i < (uint32_t) coff_nsects; i++) {
@@ -141,4 +143,4 @@
 +            coff_symbol(NULL, coff_sects[i]->namepos, 0L, i + 1, 0, 3, 1);
          fwriteint32_t(coff_sects[i]->len,    ofile);
          fwriteint16_t(coff_sects[i]->nrelocs,ofile);
-         nasm_write(filename, 12, ofile);
+         if (coff_sects[i]->flags & IMAGE_SCN_LNK_COMDAT) {
diff --git a/vars/nasm.vars b/vars/nasm.vars
new file mode 100644
index 00000000..caaa38cc
--- /dev/null
+++ b/vars/nasm.vars
@@ -0,0 +1,9 @@
+#
+# set +o errexit -o noglob -o nounset is assumed.
+#
+
+pkg_nasm_build_pre() {
+	mkdir include
+};
+
+# vim:filetype=sh textwidth=0
diff --git a/vars/nasm_host.vars b/vars/nasm_host.vars
new file mode 100644
index 00000000..25e536e2
--- /dev/null
+++ b/vars/nasm_host.vars
@@ -0,0 +1,9 @@
+#
+# set +o errexit -o noglob -o nounset is assumed.
+#
+
+pkg_nasm_host_build_pre() {
+	mkdir include
+};
+
+# vim:filetype=sh textwidth=0