Use %define instead of equ to work around NASM 0.98.38 bug;

Change cx -> bp in call to getlinsec

diff --git a/Makefile b/Makefile
index d8ec434..ea981b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ BOBJECTS = $(BTARGET) dos/syslinux.com win32/syslinux.exe memdisk/memdisk
 BSUBDIRS = memdisk dos win32
 ITARGET  = copybs.com gethostip mkdiskimage
 IOBJECTS = $(ITARGET) mtools/syslinux unix/syslinux 
-ISUBDIRS = mtools unix sample com32
+ISUBDIRS = mtools unix extlinux sample com32
 DOCS     = COPYING NEWS README TODO BUGS *.doc sample menu com32
 OTHER    = Makefile bin2c.pl now.pl genhash.pl keywords findpatch.pl \
           keytab-lilo.pl version version.pl sys2ansi.pl \

diff --git a/extlinux.asm b/extlinux.asm
index 5ec5426..571e3b3 100644 (file)
--- a/extlinux.asm
+++ b/extlinux.asm
@@ -29,8 +29,11 @@
 ; Some semi-configurable constants... change on your own risk.
 ;
 my_id          equ extlinux_id
-FILENAME_MAX_LG2 equ 8                 ; log2(Max filename size Including final null)
-FILENAME_MAX   equ (1 << FILENAME_MAX) ; Max mangled filename size
+; NASM 0.98.38 croaks if these are equ's rather than macros...
+;FILENAME_MAX_LG2 equ 8                        ; log2(Max filename size Including final null)
+;FILENAME_MAX  equ (1 << FILENAME_MAX) ; Max mangled filename size
+%define FILENAME_MAX_LG2 8
+%define FILENAME_MAX    (1 << FILENAME_MAX_LG2)
 NULLFILE       equ ' '                 ; First char space == null filename
 retry_count    equ 6                   ; How patient are we with the disk?
 %assign HIGHMEM_SLOP 0                 ; Avoid this much memory near the top
@@ -747,7 +750,7 @@ expand_super:
 ;
                mov bx,SuperBlock
                mov eax,1024 >> SECTOR_SHIFT
-               mov cx,ax
+               mov bp,ax
                call getlinsec
 
 ;