Major rewrite of the very early SYSLINUX code. Generate the "stupid"

version in a different manner.  Require NASM 0.98.32 or higher --
thus we don't need the jmpcc macros anymore.

1 files changed, 14 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 927ed36d..dc49060b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ INCLUDE  =
 CFLAGS	 = -Wall -O2 -fomit-frame-pointer
 LDFLAGS	 = -O2 -s
 
-NASM	 = nasm
+NASM	 = nasm -O99
 NINCLUDE = 
 BINDIR   = /usr/bin
 LIBDIR   = /usr/lib/syslinux
@@ -41,11 +41,11 @@ CSRC    = syslinux.c gethostip.c
 NASMSRC  = ldlinux.asm syslinux.asm copybs.asm \
 	  pxelinux.asm mbr.asm isolinux.asm isolinux-debug.asm
 SOURCES = $(CSRC) $(NASMSRC) *.inc
-BTARGET = kwdhash.gen ldlinux.bss ldlinux.sys ldlinux.bin ldlinux.lst \
+BTARGET = kwdhash.gen ldlinux.bss ldlinux.sys ldlinux.bin \
 	  pxelinux.0 mbr.bin isolinux.bin isolinux-debug.bin
 ITARGET = syslinux.com syslinux copybs.com gethostip
 DOCS    = COPYING NEWS README TODO *.doc sample
-OTHER   = Makefile bin2c.pl now.pl genhash.pl keywords genstupid.pl \
+OTHER   = Makefile bin2c.pl now.pl genhash.pl keywords findpatch.pl \
 	  keytab-lilo.pl version sys2ansi.pl ppmtolss16 lss16toppm memdisk
 OBSOLETE = pxelinux.bin
 
@@ -113,11 +113,15 @@ ldlinux.bss: ldlinux.bin
 ldlinux.sys: ldlinux.bin
 	dd if=ldlinux.bin of=ldlinux.sys  bs=512 skip=1
 
+patch.offset: ldlinux.sys findpatch.pl
+	$(PERL) findpatch.pl > patch.offset
+
 mbr.bin: mbr.asm
 	$(NASM) -f bin -l mbr.lst -o mbr.bin mbr.asm
 
-syslinux.com: syslinux.asm ldlinux.bss ldlinux.sys stupid.gen
-	$(NASM) -f bin -l syslinux.lst -o syslinux.com syslinux.asm
+syslinux.com: syslinux.asm ldlinux.bss ldlinux.sys patch.offset
+	$(NASM) -f bin -DPATCH_OFFSET=`cat patch.offset` \
+		-l syslinux.lst -o syslinux.com syslinux.asm
 
 copybs.com: copybs.asm
 	$(NASM) -f bin -l copybs.lst -o copybs.com copybs.asm
@@ -128,20 +132,12 @@ bootsect_bin.c: ldlinux.bss bin2c.pl
 ldlinux_bin.c: ldlinux.sys bin2c.pl
 	$(PERL) bin2c.pl ldlinux < ldlinux.sys > ldlinux_bin.c
 
-syslinux: syslinux.o bootsect_bin.o ldlinux_bin.o stupid.o
+syslinux: syslinux.o bootsect_bin.o ldlinux_bin.o
 	$(CC) $(LDFLAGS) -o syslinux \
-		syslinux.o bootsect_bin.o ldlinux_bin.o stupid.o
-
-ldlinux.lst: ldlinux.bin
-	: Generated by side effect
-
-stupid.c: ldlinux.lst genstupid.pl
-	$(PERL) genstupid.pl < ldlinux.lst
-
-stupid.gen: stupid.c
-	: Generated by side effect
+		syslinux.o bootsect_bin.o ldlinux_bin.o
 
-stupid.o: stupid.c
+syslinux.o: syslinux.c patch.offset
+	$(CC) $(INCLUDE) $(CFLAGS) -DPATCH_OFFSET=`cat patch.offset` -c -o $@ $<
 
 gethostip.o: gethostip.c
 
@@ -153,7 +149,7 @@ install: installer
 	install -m 644 -c $(INSTALL_LIB) $(INSTALLROOT)$(LIBDIR)
 
 local-tidy:
-	rm -f *.o *_bin.c stupid.*
+	rm -f *.o *_bin.c stupid.* patch.offset
 	rm -f syslinux.lst copybs.lst pxelinux.lst isolinux*.lst
 	rm -f $(OBSOLETE)