path: root/com32/cmenu
diff options
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:59:53 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 10:04:59 +0100
commit74518b8b691c8aba1425673864c45b7721d9a738 (patch)
tree2b0d26c3617cabfd1c5e60bc046fd872014def4a /com32/cmenu
parent8f10ba6d251ac05b54f183cb98bf5310a0675338 (diff)
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/cmenu')
1 files changed, 7 insertions, 9 deletions
diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
index 446bbcdd..00825b46 100644
--- a/com32/cmenu/Makefile
+++ b/com32/cmenu/Makefile
@@ -18,11 +18,11 @@
NOGPL := 1
# This must be defined before com32.mk is included
-LIBS = libmenu/libmenu.a
+LIBS = libmenu/libmenu.c32
topdir = ../..
MAKEDIR = $(topdir)/mk
-include $(MAKEDIR)/com32.mk
+include $(MAKEDIR)/elf.mk
CFLAGS += -I./libmenu
@@ -32,7 +32,7 @@ LIBMENU = libmenu/syslnx.o libmenu/com32io.o libmenu/tui.o \
CMENUS = $(patsubst %.c,%.c32,$(wildcard *.c))
IMENUS = $(patsubst %.menu,%.c32,$(wildcard *.menu))
.SUFFIXES: .S .c .o .elf .c32 .menu
@@ -42,16 +42,14 @@ MENUS = $(CMENUS) $(IMENUS)
all: menus
-libmenu/libmenu.a: $(LIBMENU)
- -rm -f $@
- $(AR) cq $@ $^
- $(RANLIB) $@
+libmenu/libmenu.c32: $(LIBMENU)
+ $(LD) -shared $(LDFLAGS) -o $@ $^
tidy dist:
- rm -f *.o *.lo *.a *.lst *.elf .*.d */.*.d
+ rm -f *.o *.lo *.c32 *.lst *.elf .*.d */.*.d
- rm -f libmenu/*.o libmenu/*.a
+ rm -f libmenu/*.o libmenu/*.c32
clean: tidy menuclean libclean
rm -f *.lss *.c32 *.com