diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /core/diskboot.inc | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-6.00-pre3.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/diskboot.inc')
| -rw-r--r-- | core/diskboot.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/diskboot.inc b/core/diskboot.inc index be816263..ce75b8c9 100644 --- a/core/diskboot.inc +++ b/core/diskboot.inc @@ -103,7 +103,6 @@ superblock_len_fat32 equ $-superblock+54 zb 54 ; Maximum needed size superblock_max equ $-superblock - global SecPerClust SecPerClust equ bxSecPerClust ; @@ -385,7 +384,11 @@ getonesec_cbios: ; ; kaboom: write a message and bail out. ; +%ifdef BINFMT global kaboom +%else + global kaboom:function hidden +%endif disk_error: kaboom: xor si,si |