Merge remote-tracking branch 'origin/nasm-2.12.xx'

Resolved Conflicts:
	.gitignore
	Makefile.in
	Mkfiles/msvc.mak
	Mkfiles/netware.mak
	Mkfiles/openwcom.mak
	Mkfiles/owlinux.mak
	preproc-nop.c
	preproc.c
	version

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

4 files changed, 26 insertions, 16 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 52a0d59e..d3cdca99 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -35,7 +35,7 @@ INTERNAL_CFLAGS = /I$(srcdir) /I. \
 ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LDFLAGS		= $(LDFLAGS) /SUBSYSTEM:CONSOLE /RELEASE
 LIBS		=
-PERL		= perl -I$(srcdir)/perllib
+PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 
 # Binary suffixes
 O               = obj
@@ -75,7 +75,8 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) \
 LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/nasmlib.$(O) nasmlib/ver.$(O) \
 	nasmlib/file.$(O) nasmlib/realpath.$(O) \
-	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O)
+	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O) \
+	nasmlib/srcfile.$(O)
 #-- End File Lists --#
 
 all: nasm$(X) ndisasm$(X)
@@ -296,6 +297,8 @@ nasmlib/nasmlib.$(O): nasmlib/nasmlib.c compiler.h directiv.h iflag.h \
  iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
  preproc.h regs.h tables.h tokens.h
 nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h nasmint.h nasmlib.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h hashtbl.h nasmint.h \
+ nasmlib.h
 nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
 ndisasm.$(O): ndisasm.c compiler.h directiv.h disasm.h iflag.h iflaggen.h \
  insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
@@ -324,8 +327,8 @@ output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \
 output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \
  nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
  tables.h
-output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
+output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h insnsi.h \
+ nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
  output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \
  preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
 output/outform.$(O): output/outform.c compiler.h directiv.h insnsi.h nasm.h \
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index 7cf5cc39..c2dc8006 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -56,7 +56,8 @@ NDISASM = ndisasm.o disasm.o sync.o \
 LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	nasmlib.o ver.o \
 	file.o realpath.o \
-	ilog2.o md5c.o crc64.o
+	ilog2.o md5c.o crc64.o \
+	srcfile.o
 #-- End File Lists --#
 
 NASM_OBJ = $(addprefix $(OBJDIR)/,$(notdir $(NASM))) $(EOLIST)
@@ -183,6 +184,7 @@ nasmlib.o: nasmlib.c compiler.h config.h directiv.h iflag.h iflaggen.h \
  insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
  regs.h tables.h tokens.h
 realpath.o: realpath.c compiler.h config.h nasmint.h nasmlib.h
+srcfile.o: srcfile.c compiler.h config.h hashtbl.h nasmint.h nasmlib.h
 ver.o: ver.c ver.h version.h
 ndisasm.o: ndisasm.c compiler.h config.h directiv.h disasm.h iflag.h \
  iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 9eda33e6..b25b80c0 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -22,7 +22,7 @@ LD      = *wlink
 LDEBUG      =
 LDFLAGS     = op quiet $(%TARGET_LFLAGS) $(LDEBUG)
 LIBS        =
-PERL        = perl -I$(srcdir)/perllib
+PERL        = perl -I$(srcdir)/perllib -I$(srcdir)
 
 STRIP       = wstrip
 
@@ -72,7 +72,8 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) &
 LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) &
 	nasmlib/nasmlib.$(O) nasmlib/ver.$(O) &
 	nasmlib/file.$(O) nasmlib/realpath.$(O) &
-	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O)
+	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O) &
+	nasmlib/srcfile.$(O)
 #-- End File Lists --#
 
 what:   .SYMBOLIC
@@ -323,6 +324,8 @@ nasmlib/nasmlib.$(O): nasmlib/nasmlib.c compiler.h config.h directiv.h &
  pptok.h preproc.h regs.h tables.h tokens.h
 nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h config.h nasmint.h &
  nasmlib.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h config.h hashtbl.h &
+ nasmint.h nasmlib.h
 nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
 ndisasm.$(O): ndisasm.c compiler.h config.h directiv.h disasm.h iflag.h &
  iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h &
@@ -352,11 +355,10 @@ output/outcoff.$(O): output/outcoff.c compiler.h config.h directiv.h eval.h &
 output/outdbg.$(O): output/outdbg.c compiler.h config.h directiv.h insnsi.h &
  nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h &
  regs.h tables.h
-output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h &
- eval.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h &
- output/elf.h output/outelf.h output/outform.h output/outlib.h &
- output/stabs.h pptok.h preproc.h raa.h rbtree.h regs.h saa.h stdscan.h &
- tables.h ver.h
+output/outelf.$(O): output/outelf.c compiler.h config.h directiv.h eval.h &
+ insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h &
+ output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h &
+ preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
 output/outform.$(O): output/outform.c compiler.h config.h directiv.h &
  insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/outform.h pptok.h &
  preproc.h regs.h tables.h
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 312812e1..812cbd18 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -37,7 +37,7 @@ ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LD		= $(CC)
 LDFLAGS		= $(ALL_CFLAGS)
 LIBS		=
-PERL		= perl -I$(srcdir)/perllib
+PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 
 STRIP		= wstrip
 
@@ -83,7 +83,8 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) \
 LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/nasmlib.$(O) nasmlib/ver.$(O) \
 	nasmlib/file.$(O) nasmlib/realpath.$(O) \
-	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O)
+	nasmlib/ilog2.$(O) nasmlib/md5c.$(O) nasmlib/crc64.$(O) \
+	nasmlib/srcfile.$(O)
 #-- End File Lists --#
 
 what:
@@ -288,6 +289,8 @@ nasmlib/nasmlib.$(O): nasmlib/nasmlib.c compiler.h directiv.h iflag.h \
  iflaggen.h insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h \
  preproc.h regs.h tables.h tokens.h
 nasmlib/realpath.$(O): nasmlib/realpath.c compiler.h nasmint.h nasmlib.h
+nasmlib/srcfile.$(O): nasmlib/srcfile.c compiler.h hashtbl.h nasmint.h \
+ nasmlib.h
 nasmlib/ver.$(O): nasmlib/ver.c ver.h version.h
 ndisasm.$(O): ndisasm.c compiler.h directiv.h disasm.h iflag.h iflaggen.h \
  insns.h insnsi.h nasm.h nasmint.h nasmlib.h opflags.h pptok.h preproc.h \
@@ -316,8 +319,8 @@ output/outcoff.$(O): output/outcoff.c compiler.h directiv.h eval.h insnsi.h \
 output/outdbg.$(O): output/outdbg.c compiler.h directiv.h insnsi.h nasm.h \
  nasmint.h nasmlib.h opflags.h output/outform.h pptok.h preproc.h regs.h \
  tables.h
-output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h \
- insnsi.h nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
+output/outelf.$(O): output/outelf.c compiler.h directiv.h eval.h insnsi.h \
+ nasm.h nasmint.h nasmlib.h opflags.h output/dwarf.h output/elf.h \
  output/outelf.h output/outform.h output/outlib.h output/stabs.h pptok.h \
  preproc.h raa.h rbtree.h regs.h saa.h stdscan.h tables.h ver.h
 output/outform.$(O): output/outform.c compiler.h directiv.h insnsi.h nasm.h \