core: move "-g -F stabs" to NASMOPT

Move -g -F stabs to NASMOPT.  Eventually we might need to disable them
for older versions of NASM, since the linker seems to get unhappy
about mixing older NASM stabs with gcc stabs.

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

diff --git a/core/Makefile b/core/Makefile
index 8c2f772..57d1dcb 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -51,6 +51,8 @@ LIB    = libcore.a
 LIBS    = $(LIB) $(com32)/lib/libcom32.a $(LIBGCC)
 LIBOBJS         = $(COBJ)
 
+NASMOPT += -g -F stabs
+
 # The DATE is set on the make command line when building binaries for
 # official release.  Otherwise, substitute a hex string that is pretty much
 # guaranteed to be unique to be unique from build to build.
@@ -78,8 +80,9 @@ iso%.bin: iso%.elf checksumiso.pl
        $(OBJCOPY) -O binary $< $@
 
 %.o: %.asm kwdhash.gen ../version.gen
-       ( $(NASM) -M -DDEPEND $(NINCLUDE) -o $@ $< ; echo '' ) > .$@.d; true
-       $(NASM) $(NASMOPT) -f elf -g -F stabs -DDATE_STR="'$(DATE)'" \
+       ( $(NASM) -f elf $(NASMOPT) -M -DDEPEND $(NINCLUDE) \
+         -o $@ $< ; echo '' ) > .$@.d; true
+       $(NASM) -f elf $(NASMOPT) -DDATE_STR="'$(DATE)'" \
                -DHEXDATE="$(HEXDATE)" \
                -l $(@:.o=.lsr) -o $@ $<