Merge tag 'syslinux-5.11-pre8' into firmwaresyslinux-6.02-pre1

syslinux-5.11-pre8

Conflicts:
	NEWS
	com32/lib/Makefile
	core/conio.c
	mk/devel.mk
	mk/elf.mk

3 files changed, 3 insertions, 1 deletions

diff --git a/mk/devel.mk b/mk/devel.mk
index e0429380..7c029771 100644
--- a/mk/devel.mk
+++ b/mk/devel.mk
@@ -2,3 +2,4 @@
 GCCWARN += -Wno-clobbered 
 #GCCWARN += -DDEBUG_MALLOC
 # GCCWARN += -DDEBUG_PORT=0x3f8 -DCORE_DEBUG=1
+GCCWARN += -DDYNAMIC_DEBUG
diff --git a/mk/elf.mk b/mk/elf.mk
index 8f2421a8..1ec9b2d9 100644
--- a/mk/elf.mk
+++ b/mk/elf.mk
@@ -54,7 +54,7 @@ GPLLIB     =
 GPLINCLUDE =
 endif
 
-CFLAGS     = $(GCCOPT) -W -Wall \
+CFLAGS     = $(GCCOPT) $(GCCWARN) -W -Wall \
 	     -fomit-frame-pointer -D__COM32__ -DDYNAMIC_MODULE \
 	     -nostdinc -iwithprefix include \
 	     -I$(com32)/libutil/include -I$(com32)/include \
diff --git a/mk/lib.mk b/mk/lib.mk
index 6ae26c86..bc516c2c 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -199,6 +199,7 @@ CORELIBOBJS = \
 	libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o		\
 	libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o	\
 	libgcc/__divdi3.o libgcc/__moddi3.o				\
+	syslinux/debug.o						\
 	$(LIBENTRY_OBJS) \
 	$(LIBMODULE_OBJS)