diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:42:50 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-09 14:42:50 -0700 |
| commit | 17f265f989ba4918f4e030cb6b13a98c3c9ede64 (patch) | |
| tree | 568a4fac54f338d3234db23849b7cb6abf138516 | |
| parent | c8893ccbdbafec7776dc0c190609590a6b30f11c (diff) | |
| download | syslinux-core32.tar.gz | |
core: remove hack for dynamic symbol table generationcore32
Kill hack we used to generate a dynamic symbol table. There is a much
better technique for doing this which is already deployed on the
"dynamic" branch.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | core/Makefile | 13 | ||||
| -rw-r--r-- | core/symbols.S | 5 |
2 files changed, 3 insertions, 15 deletions
diff --git a/core/Makefile b/core/Makefile index 13d07664..e53ab15b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -41,7 +41,7 @@ BTARGET = kwdhash.gen \ NASMSRC := $(wildcard *.asm) NASMHDR := $(wildcard *.inc) CSRC := $(wildcard *.c) -SSRC := $(filter-out symbols.S,$(wildcard *.S lzo/*.S)) +SSRC := $(wildcard *.S lzo/*.S) CHDR := $(wildcard *.h) OTHERSRC := keywords ALLSRC = $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC) @@ -86,16 +86,9 @@ kwdhash.gen: keywords genhash.pl -DHEXDATE="$(HEXDATE)" \ -l $(@:.o=.lsr) -o $@ -MP -MD .$@.d $< -%.elf: %.o $(LIBS) syslinux.ld symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -o $*.elf.tmp $< $(LIBS) - $(OBJCOPY) -x --extract-symbol $*.elf.tmp $*.sym - $(CC) $(CFLAGS) -DSYMFILE=\"$*.sym\" -c -o $*.sym.o symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -o $*.elf.tmp $< $*.sym.o $(LIBS) - $(OBJCOPY) -x --extract-symbol $*.elf.tmp $*.sym - $(CC) $(CFLAGS) -DSYMFILE=\"$*.sym\" -c -o $*.sym.o symbols.S - $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< $*.sym.o $(LIBS) \ +%.elf: %.o $(LIBS) syslinux.ld + $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< $(LIBS) \ > $(@:.elf=.map) - -rm -f $*.elf.tmp $(OBJDUMP) -h $@ > $(@:.elf=.sec) $(PERL) lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst) diff --git a/core/symbols.S b/core/symbols.S deleted file mode 100644 index 00cd3e80..00000000 --- a/core/symbols.S +++ /dev/null @@ -1,5 +0,0 @@ - .section ".dynlink","a" -_dynamic_symbols: - .globl _dynamic_symbols - .incbin SYMFILE - .size _dynamic_symbols, .-_dynamic_symbols |