vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* 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'.
This commit is contained in:
hollisb 2006-09-26 03:49:41 +00:00
parent 7f9a85316a
commit 663b72f0fa
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -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> 2006-09-22 Marco Gerards <marco@gnu.org>
* normal/script.c (grub_script_create_cmdmenu): Skip leading * normal/script.c (grub_script_create_cmdmenu): Skip leading

2
include/grub/powerpc/libgcc.h
View file

@ -41,3 +41,5 @@ void EXPORT_FUNC (__trampoline_setup) (void);
void EXPORT_FUNC (__truncdfsf2) (void); void EXPORT_FUNC (__truncdfsf2) (void);
void EXPORT_FUNC (__unpack_d) (void); void EXPORT_FUNC (__unpack_d) (void);
void EXPORT_FUNC (__unpack_f) (void); void EXPORT_FUNC (__unpack_f) (void);
void EXPORT_FUNC (__floatdisf) (void);
void EXPORT_FUNC (__cmpdi2) (void);

1
kern/powerpc/ieee1275/cmain.c
View file

@ -21,6 +21,7 @@
#include <alloca.h> #include <alloca.h>
#include <stdint.h> #include <stdint.h>
#include <grub/kernel.h> #include <grub/kernel.h>
#include <grub/misc.h>
#include <grub/machine/kernel.h> #include <grub/machine/kernel.h>
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>

5
kern/powerpc/ieee1275/openfw.c
View file

@ -100,11 +100,10 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
aliasname[0] = '\0'; aliasname[0] = '\0';
/* XXX: Are the while conditions correct? */ /* XXX: Are the while conditions correct? */
while (grub_ieee1275_next_property (devalias, aliasname, aliasname, &actual) while (grub_ieee1275_next_property (devalias, aliasname, aliasname, 0))
|| actual)
{ {
grub_ieee1275_phandle_t dev; grub_ieee1275_phandle_t dev;
grub_size_t pathlen; grub_ssize_t pathlen;
char *devpath; char *devpath;
/* XXX: This should be large enough for any possible case. */ /* XXX: This should be large enough for any possible case. */
char devtype[64]; char devtype[64];

4
loader/powerpc/ieee1275/linux.c
View file

@ -47,7 +47,7 @@ static grub_err_t
grub_linux_boot (void) grub_linux_boot (void)
{ {
kernel_entry_t linuxmain; kernel_entry_t linuxmain;
grub_size_t actual; grub_ssize_t actual;
/* Set the command line arguments. */ /* Set the command line arguments. */
grub_ieee1275_set_property (grub_ieee1275_chosen, "bootargs", linux_args, 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; 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"); grub_error (GRUB_ERR_BAD_OS, "Invalid offset in program header");
goto fail; goto fail;