aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-21 20:49:08 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-21 20:49:08 -0800
commitb40e01859f8ce6ed552acbb3b087c931517a48d6 (patch)
tree253751d8a2bd5904f7ecc625d1fd21e0e3215772 /core
parentb83eb9f9ba49d898e1d753ffee91f648a16f955b (diff)
downloadsyslinux-elf-b40e01859f8ce6ed552acbb3b087c931517a48d6.tar.gz
syslinux-elf-b40e01859f8ce6ed552acbb3b087c931517a48d6.tar.xz
syslinux-elf-b40e01859f8ce6ed552acbb3b087c931517a48d6.zip
pxelinux: workaround for old versions of NASM
Old versions of NASM would miscompile forward EQU references. In this case, fixing that problem is easy, so just do it.
Diffstat (limited to 'core')
-rw-r--r--core/pxelinux.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 344d094c..a660bd6c 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -977,8 +977,6 @@ memory_scan_common:
;
; Clobbers CX and SI
;
-is_pxe equ is_struc.pxe
-is_pxenv equ is_struc.pxenv
is_struc:
.pxe:
cmp dword [es:bx],'!PXE'
@@ -1007,6 +1005,9 @@ is_struc:
.bad:
ret
+is_pxe equ is_struc.pxe
+is_pxenv equ is_struc.pxenv
+
;
; close_file:
; Deallocates a file structure (pointer in SI)