diff options
| author | Matt Fleming <matt.fleming@linux.intel.com> | 2011-04-26 09:59:53 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@linux.intel.com> | 2011-04-26 10:04:59 +0100 |
| commit | 74518b8b691c8aba1425673864c45b7721d9a738 (patch) | |
| tree | 2b0d26c3617cabfd1c5e60bc046fd872014def4a /com32/modules/Makefile | |
| parent | 8f10ba6d251ac05b54f183cb98bf5310a0675338 (diff) | |
| download | syslinux-74518b8b691c8aba1425673864c45b7721d9a738.tar.gz | |
elflink: Make ELF the default object format
com32/elflink/modules was originally created to house ELF modules and
keep them separate from the COM32 modules as the elflink branch was
being developed. However, this has inadvertently created a maintenance
nightmare because code was copied from elsewhere in the tree into
com32/elflink/modules, resulting in duplication. Bug fixes have been
going into the original code but have not been merged onto the elflink
branch, leaving the duplicate code in com32/elflink/modules buggy.
So let's delete this directory. There really is no reason to keep ELF
and COM32 modules separate because there's no reason to need both
COM32 and ELF modules to coexist. ELF is a far superior object file
format and all modules are not emitted as ELF objects.
Now that we're outputting ELF modules we can use dynamic memory
instead of the cs_bounce bounce buffer.
This commit requires a certain amount of shuffling for some
files. quicksort.c isn't a module and belongs as part of the util
library. cli.h belongs in com32/include so that other modules can make
use of the cli code in ldlinux.c32.
All libraries are now ELF shared libraries which are only loaded to
fixup unresolved symbols for executable modules and renamed from *.a
to *.c32. This reduces the runtime memory footprint because libraries
are only loaded when needed and because every executable no longer
gets its own copy of code/data (as it would if linking with a static
library). Also, remove MINLIBOBJS from libcom32.c32 because it is
already part of libcom32min.a and we don't want to have any duplicate
symbols between the core (which links with libcom32min.a) and
libcom32.c32.
Welcome to the New World Order of ELF modules!
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index e9ce1d1f..9d88d75b 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -17,32 +17,24 @@ topdir = ../.. MAKEDIR = $(topdir)/mk -include $(MAKEDIR)/com32.mk +include $(MAKEDIR)/elf.mk MODULES = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \ disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \ meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \ kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \ - ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32 + ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 whichsys.c32 \ + hello.c32 TESTFILES = all: $(MODULES) $(TESTFILES) -pcitest.elf : pcitest.o $(LIBS) $(C_LIBS) - $(LD) $(LDFLAGS) -o $@ $^ - -cpuidtest.elf : cpuidtest.o $(GPLLIB) $(LIBS) $(C_LIBS) - $(LD) $(LDFLAGS) -o $@ $^ - .PRECIOUS: %.o dmitest.o: dmitest.c $(CC) $(CFLAGS) $(GPLINCLUDE) -c -o $@ $< -dmitest.elf : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) - $(LD) $(LDFLAGS) -o $@ $^ - -ethersel.elf : ethersel.o $(LIBS) $(C_LIBS) +dmitest.c32 : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ tidy dist: |