aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-06-08 15:12:32 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:03 +0800
commitff7c5a325bc16720904dc14d3fc2f899205cd4fa (patch)
treee4a9e7296d7a301aa495cb013fde44f649443a6a
parentf86e7a6867e35bda1be65b8388c1cc6fecd198ba (diff)
downloadsyslinux-ff7c5a325bc16720904dc14d3fc2f899205cd4fa.tar.gz
syslinux-ff7c5a325bc16720904dc14d3fc2f899205cd4fa.tar.xz
syslinux-ff7c5a325bc16720904dc14d3fc2f899205cd4fa.zip
elflink: fix some compile error
-rw-r--r--com32/include/stdio.h3
-rw-r--r--core/Makefile4
-rw-r--r--core/hello.c2
-rw-r--r--core/ui.inc3
4 files changed, 9 insertions, 3 deletions
diff --git a/com32/include/stdio.h b/com32/include/stdio.h
index f37bdd9e..57efbfd3 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 166f0e4e..2e5ce7cc 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 68eec044..0f1a3a49 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 41e6fbac..40224134 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