From: hollisb <hollisb@localhost>
Date: Tue, 26 Sep 2006 03:49:41 +0000 (+0000)
Subject: 2005-09-25  Hollis Blanchard  <hollis@penguinppc.org>
X-Git-Tag: 1.98~1921
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=663b72f0faaf9537414438dcab0120193441ec1f;p=thirdparty%2Fgrub.git

2005-09-25  Hollis Blanchard  <hollis@penguinppc.org>

	* include/grub/powerpc/libgcc.h (__floatdisf): New prototype.
	(__cmpdi): Likewise.

	* kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): Pass 0 as
	`flags' to `grub_ieee1275_next_property'.  Change `pathlen' to type
	`grub_ssize_t'.

	* kern/powerpc/ieee1275/cmain.c: include grub/misc.h.

	* loader/powerpc/ieee1275/linux.c (grub_linux_boot): Change `actual'
	to type `grub_ssize_t'.
	(grub_rescue_cmd_linux): Cast -1 to `grub_off_t'.
---

diff --git a/ChangeLog b/ChangeLog
index 2882cd840..5a9d5a1a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-09-25  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* include/grub/powerpc/libgcc.h (__floatdisf): New prototype.
+	(__cmpdi): Likewise.
+
+	* kern/powerpc/ieee1275/openfw.c (grub_devalias_iterate): Pass 0 as
+	`flags' to `grub_ieee1275_next_property'.  Change `pathlen' to type
+	`grub_ssize_t'.
+
+	* kern/powerpc/ieee1275/cmain.c: include grub/misc.h.
+
+	* loader/powerpc/ieee1275/linux.c (grub_linux_boot): Change `actual'
+	to type `grub_ssize_t'.
+	(grub_rescue_cmd_linux): Cast -1 to `grub_off_t'.
+
 2006-09-22  Marco Gerards  <marco@gnu.org>
 
 	* normal/script.c (grub_script_create_cmdmenu): Skip leading
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index 331c6a299..cca6a1c83 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -41,3 +41,5 @@ void EXPORT_FUNC (__trampoline_setup) (void);
 void EXPORT_FUNC (__truncdfsf2) (void);
 void EXPORT_FUNC (__unpack_d) (void);
 void EXPORT_FUNC (__unpack_f) (void);
+void EXPORT_FUNC (__floatdisf) (void);
+void EXPORT_FUNC (__cmpdi2) (void);
diff --git a/kern/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c
index b3ec2b766..dcc0247db 100644
--- a/kern/powerpc/ieee1275/cmain.c
+++ b/kern/powerpc/ieee1275/cmain.c
@@ -21,6 +21,7 @@
 #include <alloca.h>
 #include <stdint.h>
 #include <grub/kernel.h>
+#include <grub/misc.h>
 #include <grub/machine/kernel.h>
 #include <grub/ieee1275/ieee1275.h>
 
diff --git a/kern/powerpc/ieee1275/openfw.c b/kern/powerpc/ieee1275/openfw.c
index 39195ce16..ad86f7b92 100644
--- a/kern/powerpc/ieee1275/openfw.c
+++ b/kern/powerpc/ieee1275/openfw.c
@@ -100,11 +100,10 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
   aliasname[0] = '\0';
 
   /* XXX: Are the while conditions correct?  */
-  while (grub_ieee1275_next_property (devalias, aliasname, aliasname, &actual)
-	 || actual)
+  while (grub_ieee1275_next_property (devalias, aliasname, aliasname, 0))
     {
       grub_ieee1275_phandle_t dev;
-      grub_size_t pathlen;
+      grub_ssize_t pathlen;
       char *devpath;
       /* XXX: This should be large enough for any possible case.  */
       char devtype[64];
diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index 790b3731b..a9a560141 100644
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -47,7 +47,7 @@ static grub_err_t
 grub_linux_boot (void)
 {
   kernel_entry_t linuxmain;
-  grub_size_t actual;
+  grub_ssize_t actual;
 
   /* Set the command line arguments.  */
   grub_ieee1275_set_property (grub_ieee1275_chosen, "bootargs", linux_args,
@@ -196,7 +196,7 @@ grub_rescue_cmd_linux (int argc, char *argv[])
 	{
 	  void *segment_addr = ((char *) entry) + offset;
 
-	  if (grub_file_seek (file, phdr->p_offset) == -1)
+	  if (grub_file_seek (file, phdr->p_offset) == (grub_off_t) -1)
 	    {
 	      grub_error (GRUB_ERR_BAD_OS, "Invalid offset in program header");
 	      goto fail;