2005-02-13 Hollis Blanchard <hollis@penguinppc.org>

	* conf/powerpc-ieee1275.rmk (pkgdata_MODULES): Add ls.mod.
	* include/grub/powerpc/libgcc.h (__mulsf3): New prototype.

diff --git a/ChangeLog b/ChangeLog
index 1a1732cf16681b414b51e18b3d326f7252ababf5..00bbf6b6cd7facf8c613630ee256bc3a1637b638 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-13  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * conf/powerpc-ieee1275.rmk (pkgdata_MODULES): Add ls.mod.
+       * include/grub/powerpc/libgcc.h (__mulsf3): New prototype.
+
 2005-02-12  Hollis Blanchard  <hollis@penguinppc.org>
 
        * kern/partition.c (grub_partition_probe): Clear `grub_errno' and

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index b9fb22198735fd51115af762c6370015b27ab774..e6c2001bbd02a861e727ebc537f878fae92163d0 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -639,7 +639,7 @@ genmoddep-util_genmoddep.d: util/genmoddep.c
 
 # Modules.
 pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
-       hfs.mod jfs.mod normal.mod hello.mod font.mod \
+       hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
        boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
        pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod
 
@@ -1198,6 +1198,41 @@ terminal_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For ls.mod.
 ls_mod_SOURCES = commands/ls.c
+CLEANFILES += ls.mod mod-ls.o mod-ls.c pre-ls.o ls_mod-commands_ls.o def-ls.lst und-ls.lst
+MOSTLYCLEANFILES += ls_mod-commands_ls.d
+DEFSYMFILES += def-ls.lst
+UNDSYMFILES += und-ls.lst
+
+ls.mod: pre-ls.o mod-ls.o
+       -rm -f $@
+       $(LD) -r -d -o $@ $^
+       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
+
+pre-ls.o: ls_mod-commands_ls.o
+       -rm -f $@
+       $(LD) -r -d -o $@ $^
+
+mod-ls.o: mod-ls.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
+
+mod-ls.c: moddep.lst genmodsrc.sh
+       sh $(srcdir)/genmodsrc.sh 'ls' $< > $@ || (rm -f $@; exit 1)
+
+def-ls.lst: pre-ls.o
+       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 ls/' > $@
+
+und-ls.lst: pre-ls.o
+       echo 'ls' > $@
+       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+ls_mod-commands_ls.o: commands/ls.c
+       $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -c -o $@ $<
+
+ls_mod-commands_ls.d: commands/ls.c
+       set -e;           $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) $(ls_mod_CFLAGS) -M $<      | sed 's,ls\.o[ :]*,ls_mod-commands_ls.o $@ : ,g' > $@;         [ -s $@ ] || rm -f $@
+
+-include ls_mod-commands_ls.d
+
 ls_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For cmp.mod.

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index b29d88cff46853a40bc841eba3c042ea9358fbf1..a06a58f6656587a49fb8e339f6dfa739c8c1dcf9 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -63,7 +63,7 @@ genmoddep_SOURCES = util/genmoddep.c
 
 # Modules.
 pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
-       hfs.mod jfs.mod normal.mod hello.mod font.mod \
+       hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
        boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
        pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod
 

diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index 00c0edeff6b4ad9802767c2944c718caf6a6222f..331c6a2999ef0ff02a4695b2b65bb7ec1bfe8df9 100644 (file)
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -30,6 +30,7 @@ void EXPORT_FUNC (__lshrdi3) (void);
 void EXPORT_FUNC (__make_dp) (void);
 void EXPORT_FUNC (__make_fp) (void);
 void EXPORT_FUNC (__muldf3) (void);
+void EXPORT_FUNC (__mulsf3) (void);
 void EXPORT_FUNC (__pack_d) (void);
 void EXPORT_FUNC (__pack_f) (void);
 void EXPORT_FUNC (__subdf3) (void);