From b6063f3876d95104fd3689b059030d0af797d946 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 16 May 2009 22:12:41 -0700 Subject: [PATCH] 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 --- core/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 8c2f772..57d1dcb 100644 --- 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 $@ $< -- 2.7.4