aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-06-04 16:21:22 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:03 +0800
commit4f0c539f915d7b69ae68bca3f17f8d74b4b2639d (patch)
tree2bba74be10098da32bc7099604d6867cc8f9d4d3
parent58ddf011b33b45676ad8436ae870fa7050c0a228 (diff)
downloadsyslinux-4f0c539f915d7b69ae68bca3f17f8d74b4b2639d.tar.gz
syslinux-4f0c539f915d7b69ae68bca3f17f8d74b4b2639d.tar.xz
syslinux-4f0c539f915d7b69ae68bca3f17f8d74b4b2639d.zip
core/Makefile: temp change
-rw-r--r--core/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/core/Makefile b/core/Makefile
index 66b3fe66..166f0e4e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -50,9 +50,7 @@ COBJ := $(patsubst %.c,%.o,$(CSRC))
SOBJ := $(patsubst %.S,%.o,$(SSRC))
LIB = libcore.a
-#LIBS = $(LIB) $(com32)/lib/libcomcore.a $(LIBGCC)
-LIBS = $(LIB) $(LIBGCC) --whole-archive $(com32)/lib/libcom32min.a
-LIBDEP = $(filter-out -% %start%,$(LIBS))
+LIBS = $(LIB) $(com32)/lib/libcomcore.a $(LIBGCC)
LIBOBJS = $(COBJ) $(SOBJ)
NASMDEBUG = -g -F dwarf
@@ -90,12 +88,9 @@ kwdhash.gen: keywords genhash.pl
-DHEXDATE="$(HEXDATE)" \
-l $(@:.o=.lsr) -o $@ -MP -MD .$@.d $<
-#%.elf: %.o $(LIBS) syslinux.ld
-# $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< \
-# --start-group $(LIBS) --end-group \
-%.elf: %.o $(LIBDEP) syslinux.ld
- $(LD) $(LDFLAGS) -Bsymbolic -pie -E --hash-style=gnu \
- -T syslinux.ld -M -o $@ $< $(LIBS) \
+%.elf: %.o $(LIBS) syslinux.ld
+ $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< \
+ --start-group $(LIBS) --end-group \
> $(@:.elf=.map)
$(OBJDUMP) -h $@ > $(@:.elf=.sec)
$(PERL) lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst)