aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-02-28 15:48:53 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2014-02-28 15:48:53 -0800
commita06818de2a4c49bd64a024dd4f4a09a0caf1f0ac (patch)
tree150612342505727b9f7994130c927147679ac3d2 /core
parente01e93b0f29b6dc9e363d91175ef3f7ecb40f8bf (diff)
downloadsyslinux-a06818de2a4c49bd64a024dd4f4a09a0caf1f0ac.tar.gz
syslinux-a06818de2a4c49bd64a024dd4f4a09a0caf1f0ac.tar.xz
syslinux-a06818de2a4c49bd64a024dd4f4a09a0caf1f0ac.zip
core, bios: Move __syslinux_shuffler_size to assemblysyslinux-6.03-pre5
Putting the __syslinux_shuffler_size in a C file by itself caused it to not get included in the core, causing failures. Put it in assembly to make sure it really gets included there. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core')
-rw-r--r--core/bcopyxx.inc7
-rw-r--r--core/shuffler.c8
2 files changed, 7 insertions, 8 deletions
diff --git a/core/bcopyxx.inc b/core/bcopyxx.inc
index cfdda0bc..2bdc053d 100644
--- a/core/bcopyxx.inc
+++ b/core/bcopyxx.inc
@@ -316,5 +316,12 @@ RM_IDT_ptr: dw 0FFFFh ; Length (nonsense, but matches CPU)
bcopyxx_stack equ 128 ; We want this much stack
+ section .rodata
+ global __syslinux_shuffler_size
+ extern __bcopyxx_len
+ align 4
+__syslinux_shuffler_size:
+ dd __bcopyxx_len
+
bits 16
section .text16
diff --git a/core/shuffler.c b/core/shuffler.c
deleted file mode 100644
index eca1b4a3..00000000
--- a/core/shuffler.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "core.h"
-
-#ifdef __FIRMWARE_BIOS__
-
-extern const char __bcopyxx_len[]; /* Linker script absolute symbol */
-const size_t __syslinux_shuffler_size = (size_t)__bcopyxx_len;
-
-#endif /* __FIRMWARE_BIOS__ */