[syslinux:elflink] core/Makefile: temp change

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


Commit-ID:  4f0c539f915d7b69ae68bca3f17f8d74b4b2639d
Gitweb:     http://syslinux.zytor.com/commit/4f0c539f915d7b69ae68bca3f17f8d74b4b2639d
Author:     Feng Tang <feng.tang at intel.com>
AuthorDate: Fri, 4 Jun 2010 16:21:22 +0800
Committer:  Feng Tang <feng.tang at intel.com>
CommitDate: Tue, 20 Jul 2010 11:10:03 +0800

core/Makefile: temp change



---
 core/Makefile |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 66b3fe6..166f0e4 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)



More information about the Syslinux-commits mailing list