From 7dc15d8e6a417027602a0852b5904cd138146878 Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 28 Feb 2008 13:04:35 +0000 Subject: [PATCH] 2008-02-28 Robert Millan * conf/i386-linuxbios.rmk (pkglib_MODULES): Add aout.mod. (aout_mod_SOURCES): New variable. (aout_mod_CFLAGS): Likewise. (aout_mod_LDFLAGS): Likewise. * conf/i386-ieee1275.rmk: Likewise. --- ChangeLog | 9 +++++++ conf/i386-ieee1275.rmk | 7 +++++- conf/i386-linuxbios.mk | 55 ++++++++++++++++++++++++++++++++++++++++- conf/i386-linuxbios.rmk | 9 +++++-- 4 files changed, 76 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13da46b54..ee39b6478 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-02-28 Robert Millan + + * conf/i386-linuxbios.rmk (pkglib_MODULES): Add aout.mod. + (aout_mod_SOURCES): New variable. + (aout_mod_CFLAGS): Likewise. + (aout_mod_LDFLAGS): Likewise. + + * conf/i386-ieee1275.rmk: Likewise. + 2008-02-28 Robert Millan * util/update-grub.in: Reorganise terminal validity check. Accept diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk index f69ea7d77..80d2037b5 100644 --- a/conf/i386-ieee1275.rmk +++ b/conf/i386-ieee1275.rmk @@ -97,7 +97,7 @@ grub_emu_LDFLAGS = $(LIBCURSES) # Modules. pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod \ - multiboot.mod _multiboot.mod serial.mod + multiboot.mod _multiboot.mod aout.mod serial.mod # For normal.mod. normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \ @@ -121,6 +121,11 @@ multiboot_mod_SOURCES = loader/multiboot_loader_normal.c multiboot_mod_CFLAGS = $(COMMON_CFLAGS) multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) +# For aout.mod. +aout_mod_SOURCES = loader/aout.c +aout_mod_CFLAGS = $(COMMON_CFLAGS) +aout_mod_LDFLAGS = $(COMMON_LDFLAGS) + # For suspend.mod suspend_mod_SOURCES = commands/ieee1275/suspend.c suspend_mod_CFLAGS = $(COMMON_CFLAGS) diff --git a/conf/i386-linuxbios.mk b/conf/i386-linuxbios.mk index 1b80fe350..7be8f8cf5 100644 --- a/conf/i386-linuxbios.mk +++ b/conf/i386-linuxbios.mk @@ -548,7 +548,8 @@ grub_emu_LDFLAGS = $(LIBCURSES) # Modules. pkglib_MODULES = _linux.mod linux.mod normal.mod \ _multiboot.mod multiboot.mod play.mod \ - cpuid.mod serial.mod ata.mod + cpuid.mod serial.mod ata.mod \ + aout.mod # For _linux.mod. _linux_mod_SOURCES = loader/i386/pc/linux.c @@ -1125,6 +1126,58 @@ fs-multiboot_mod-loader_multiboot_loader_normal.lst: loader/multiboot_loader_nor multiboot_mod_CFLAGS = $(COMMON_CFLAGS) multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) +# For aout.mod +aout_mod_SOURCES = loader/aout.c +CLEANFILES += aout.mod mod-aout.o mod-aout.c pre-aout.o aout_mod-loader_aout.o und-aout.lst +ifneq ($(aout_mod_EXPORTS),no) +CLEANFILES += def-aout.lst +DEFSYMFILES += def-aout.lst +endif +MOSTLYCLEANFILES += aout_mod-loader_aout.d +UNDSYMFILES += und-aout.lst + +aout.mod: pre-aout.o mod-aout.o + -rm -f $@ + $(TARGET_CC) $(aout_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@ + +pre-aout.o: $(aout_mod_DEPENDENCIES) aout_mod-loader_aout.o + -rm -f $@ + $(TARGET_CC) $(aout_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ aout_mod-loader_aout.o + +mod-aout.o: mod-aout.c + $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -c -o $@ $< + +mod-aout.c: moddep.lst genmodsrc.sh + sh $(srcdir)/genmodsrc.sh 'aout' $< > $@ || (rm -f $@; exit 1) + +ifneq ($(aout_mod_EXPORTS),no) +def-aout.lst: pre-aout.o + $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 aout/' > $@ +endif + +und-aout.lst: pre-aout.o + echo 'aout' > $@ + $(NM) -u -P -p $< | cut -f1 -d' ' >> $@ + +aout_mod-loader_aout.o: loader/aout.c $(loader/aout.c_DEPENDENCIES) + $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -MD -c -o $@ $< +-include aout_mod-loader_aout.d + +CLEANFILES += cmd-aout_mod-loader_aout.lst fs-aout_mod-loader_aout.lst +COMMANDFILES += cmd-aout_mod-loader_aout.lst +FSFILES += fs-aout_mod-loader_aout.lst + +cmd-aout_mod-loader_aout.lst: loader/aout.c $(loader/aout.c_DEPENDENCIES) gencmdlist.sh + set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh aout > $@ || (rm -f $@; exit 1) + +fs-aout_mod-loader_aout.lst: loader/aout.c $(loader/aout.c_DEPENDENCIES) genfslist.sh + set -e; $(TARGET_CC) -Iloader -I$(srcdir)/loader $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(aout_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh aout > $@ || (rm -f $@; exit 1) + + +aout_mod_CFLAGS = $(COMMON_CFLAGS) +aout_mod_LDFLAGS = $(COMMON_LDFLAGS) + # For play.mod. play_mod_SOURCES = commands/i386/pc/play.c CLEANFILES += play.mod mod-play.o mod-play.c pre-play.o play_mod-commands_i386_pc_play.o und-play.lst diff --git a/conf/i386-linuxbios.rmk b/conf/i386-linuxbios.rmk index 51beb9507..3eafe4dc8 100644 --- a/conf/i386-linuxbios.rmk +++ b/conf/i386-linuxbios.rmk @@ -95,8 +95,8 @@ grub_emu_LDFLAGS = $(LIBCURSES) # Modules. pkglib_MODULES = _linux.mod linux.mod normal.mod \ - _multiboot.mod multiboot.mod play.mod \ - cpuid.mod serial.mod ata.mod + _multiboot.mod multiboot.mod aout.mod \ + play.mod cpuid.mod serial.mod ata.mod # For _linux.mod. _linux_mod_SOURCES = loader/i386/pc/linux.c @@ -136,6 +136,11 @@ multiboot_mod_SOURCES = loader/multiboot_loader_normal.c multiboot_mod_CFLAGS = $(COMMON_CFLAGS) multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS) +# For aout.mod. +aout_mod_SOURCES = loader/aout.c +aout_mod_CFLAGS = $(COMMON_CFLAGS) +aout_mod_LDFLAGS = $(COMMON_LDFLAGS) + # For play.mod. play_mod_SOURCES = commands/i386/pc/play.c play_mod_CFLAGS = $(COMMON_CFLAGS)