diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
| commit | df2195b6a978448f640cae552858740d214886a4 (patch) | |
| tree | ad9a7198f2b89ad36e6d06fc7bfb560b3fc0ce74 /Mkfiles | |
| parent | fef75c265a2dafb6482ffd4078f74f2a66fa2535 (diff) | |
| parent | 3b91f4c117003a9f42717fe88257b6025790169e (diff) | |
| download | nasm-df2195b6a978448f640cae552858740d214886a4.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.14.xx'
Resolved Conflicts:
Makefile.in
Mkfiles/msvc.mak
Mkfiles/openwcom.mak
asm/nasm.c
nasmlib/alloc.c
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 5 | ||||
| -rw-r--r-- | Mkfiles/openwcom.mak | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 89e392d9..9c7d60e0 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -68,8 +68,9 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \ \ nasmlib\ver.$(O) \ - nasmlib\crc64.$(O) nasmlib\alloc.$(O) nasmlib\asprintf.$(O) \ - nasmlib\md5c.$(O) nasmlib\string.$(O) nasmlib\nctype.$(O) \ + nasmlib\alloc.$(O) nasmlib\asprintf.$(O) nasmlib\errfile.$(O) \ + nasmlib\crc64.$(O) nasmlib\md5c.$(O) \ + nasmlib\string.$(O) nasmlib\nctype.$(O) \ nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) \ nasmlib\realpath.$(O) nasmlib\path.$(O) \ nasmlib\filename.$(O) \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 1c407dea..2babe5dc 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -57,8 +57,9 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) & & nasmlib\ver.$(O) & - nasmlib\crc64.$(O) nasmlib\alloc.$(O) nasmlib\asprintf.$(O) & - nasmlib\md5c.$(O) nasmlib\string.$(O) nasmlib\nctype.$(O) & + nasmlib\alloc.$(O) nasmlib\asprintf.$(O) nasmlib\errfile.$(O) & + nasmlib\crc64.$(O) nasmlib\md5c.$(O) & + nasmlib\string.$(O) nasmlib\nctype.$(O) & nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) & nasmlib\realpath.$(O) nasmlib\path.$(O) & nasmlib\filename.$(O) & |