[syslinux:elflink] elflink: fix some compile error

syslinux-bot for Feng Tang feng.tang at intel.com
Thu Aug 12 21:03:10 PDT 2010


Commit-ID:  ff7c5a325bc16720904dc14d3fc2f899205cd4fa
Gitweb:     http://syslinux.zytor.com/commit/ff7c5a325bc16720904dc14d3fc2f899205cd4fa
Author:     Feng Tang <feng.tang at intel.com>
AuthorDate: Tue, 8 Jun 2010 15:12:32 +0800
Committer:  Feng Tang <feng.tang at intel.com>
CommitDate: Tue, 20 Jul 2010 11:10:03 +0800

elflink: fix some compile error



---
 com32/include/stdio.h |    3 +++
 core/Makefile         |    4 ++--
 core/hello.c          |    2 ++
 core/ui.inc           |    3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/com32/include/stdio.h b/com32/include/stdio.h
index f37bdd9..57efbfd 100644
--- a/com32/include/stdio.h
+++ b/com32/include/stdio.h
@@ -100,6 +100,9 @@ __extern int vsnprintf(char *, size_t n, const char *, va_list);
 __extern int asprintf(char **, const char *, ...);
 __extern int vasprintf(char **, const char *, va_list);
 
+#define mp(f, x...) \
+        printf("[%s()]: " f "\n", __func__,##x)
+
 /* No buffering, so no flushing needed */
 static __inline__ int fflush(FILE * __f)
 {
diff --git a/core/Makefile b/core/Makefile
index 166f0e4..2e5ce7c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -49,8 +49,8 @@ ALLSRC    = $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC)
 COBJ	 := $(patsubst %.c,%.o,$(CSRC))
 SOBJ	 := $(patsubst %.S,%.o,$(SSRC))
 
-LIB	 = libcore.a
-LIBS	 = $(LIB) $(com32)/lib/libcomcore.a $(LIBGCC)
+LIB	 = libcom32.a
+LIBS	 = $(LIB) $(com32)/lib/libcom32min.a $(LIBGCC)
 LIBOBJS	 = $(COBJ) $(SOBJ)
 
 NASMDEBUG = -g -F dwarf
diff --git a/core/hello.c b/core/hello.c
index 68eec04..0f1a3a4 100644
--- a/core/hello.c
+++ b/core/hello.c
@@ -48,12 +48,14 @@ void hexdump(void *buf, int bytelen, const char *str)
 	printf("\n\n");		
 }
 
+/*
 void mydump(void)
 {
 	printf("append buf at %x\n", AppendBuf);
 
 	hexdump(AppendBuf, 60, "appendbuf");
 }
+*/
 
 static inline void myprint(int num)
 {
diff --git a/core/ui.inc b/core/ui.inc
index 41e6fba..4022413 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -15,12 +15,13 @@
 ; This file should be entered with the config file open (for getc)
 ;
 %if 1
-;on_error:
+on_error:
 no_config_file:
 enter_command:
 auto_boot:
 load_kernel:
 kernel_good_saved:
+kernel_corrupt:
 		pm_call hello
 		pm_call enter_cmdline		; Never return
 	



More information about the Syslinux-commits mailing list