From: hollisb <hollisb@localhost>
Date: Sun, 13 Feb 2005 18:54:57 +0000 (+0000)
Subject: 2005-02-13  Hollis Blanchard  <hollis@penguinppc.org>
X-Git-Tag: 1.98~2152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eabe94bd9fa02bc81124d83a4749309e0e6ba15;p=thirdparty%2Fgrub.git

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 1a1732cf1..00bbf6b6c 100644
--- 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 b9fb22198..e6c2001bb 100644
--- 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 b29d88cff..a06a58f66 100644
--- 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 00c0edeff..331c6a299 100644
--- 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);