summaryrefslogtreecommitdiff
path: root/Mkfiles
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-11 13:06:14 -0800
committerH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-11 13:37:32 -0800
commit64471097ca7598e8238f9e5ed25b3afaa9b10f2c (patch)
treed31d4d84403d36500b30a372d03596ae9459c2d4 /Mkfiles
parentebb05a0e5fa8dfae58e6a00e550005df4b0f58f8 (diff)
downloadnasm-64471097ca7598e8238f9e5ed25b3afaa9b10f2c.tar.gz
strlist: merge the strtbl and strlist interfaces
The currently-unused strtbl was basically a slightly different version of strlist, with the find and linearize capabilities. Merge these two together by augmenting strlist to have the same capabilities. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
-rw-r--r--Mkfiles/msvc.mak1
-rw-r--r--Mkfiles/openwcom.mak1
2 files changed, 0 insertions, 2 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 57b8cefc..7ea3b55a 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -101,7 +101,6 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
macros\macros.$(O) \
\
output\outform.$(O) output\outlib.$(O) output\legacy.$(O) \
- output\strtbl.$(O) \
output\nulldbg.$(O) output\nullout.$(O) \
output\outbin.$(O) output\outaout.$(O) output\outcoff.$(O) \
output\outelf.$(O) \
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 5b704fda..2b0031af 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -90,7 +90,6 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
macros\macros.$(O) &
&
output\outform.$(O) output\outlib.$(O) output\legacy.$(O) &
- output\strtbl.$(O) &
output\nulldbg.$(O) output\nullout.$(O) &
output\outbin.$(O) output\outaout.$(O) output\outcoff.$(O) &
output\outelf.$(O) &