summaryrefslogtreecommitdiff
path: root/com32/lib/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-05-01 08:55:45 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-06-07 14:19:20 +0100
commitc0d18deeee22f3466fd863d64b432660965ec66e (patch)
tree8fce613ef56efd6d112ede4e394051a99490a66f /com32/lib/Makefile
parent4fc3fd1e14f4c1b9208ef262e5b6aef853e9fce4 (diff)
downloadsyslinux-c0d18deeee22f3466fd863d64b432660965ec66e.tar.gz
elflink: Fix boot sector booting
This adds missing support for booting from a boot sector file such as .bs, .bss or .0, by re-implementing the old asm bootsec code from core/bootsect.inc in C. This has resulted in some external changes. We've had to make StackBuf a global symbol because we access it directly from execute.c. Also, we need to move dsinfo.c into MINLIBOBJS because ldlinux now needs to reference __syslinux_derivative_info. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/lib/Makefile')
-rw-r--r--com32/lib/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index a0ddb9d6..4edf0a41 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -47,7 +47,7 @@ LIBPCI_OBJS = \
LIBSYSLINUX_OBJS = \
syslinux/reboot.o syslinux/keyboard.o \
syslinux/features.o syslinux/config.o \
- syslinux/dsinfo.o syslinux/version.o \
+ syslinux/version.o \
syslinux/pxe_get_cached.o syslinux/pxe_get_nic.o \
syslinux/video/fontquery.o syslinux/video/reportmode.o
@@ -178,6 +178,7 @@ CORELIBOBJS = \
MINLIBOBJS = \
syslinux/ipappend.o \
+ syslinux/dsinfo.o \
$(LIBOTHER_OBJS) \
$(LIBGCC_OBJS) \
$(LIBCONSOLE_OBJS) \