grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

PPC compiles fixes


From: Jeroen Dekkers
Subject: PPC compiles fixes
Date: Fri, 30 Apr 2004 21:15:38 +0200
User-agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.6 (Maruoka) FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3.50 (i686-pc-linux-gnu) MULE/5.0 (SAKAKI)

Here is a patch that should make the PPC port of GRUB 2 compile.
I made these changes on an iBook from someone else and since I don't
have PPC hardware I can't test it further.  I hope Marco can test it.

Jeroen Dekkers

Index: conf/powerpc-ieee1275.rmk
===================================================================
RCS file: /cvsroot/grub/grub2/conf/powerpc-ieee1275.rmk,v
retrieving revision 1.2
diff -u -p -r1.2 powerpc-ieee1275.rmk
--- conf/powerpc-ieee1275.rmk   4 Apr 2004 13:46:00 -0000       1.2
+++ conf/powerpc-ieee1275.rmk   6 Apr 2004 22:07:40 -0000
@@ -27,8 +27,10 @@ grub_emu_SOURCES = kern/main.c kern/devi
        disk/powerpc/ieee1275/partition.c                                       
\
        util/i386/pc/biosdisk.c fs/fat.c fs/ext2.c                      \
        normal/cmdline.c normal/command.c normal/main.c normal/menu.c   \
+       normal/arg.c    \
        util/console.c util/grub-emu.c util/misc.c util/i386/pc/getroot.c \
-       kern/env.c 
+       kern/env.c commands/ls.c                \
+       commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c
 grub_emu_LDFLAGS = -lncurses
 
 grubof_SOURCES = boot/powerpc/ieee1275/cmain.c 
boot/powerpc/ieee1275/ieee1275.c \
@@ -43,7 +45,7 @@ grubof_SOURCES = boot/powerpc/ieee1275/c
 grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 grubof_CFLAGS = $(COMMON_CFLAGS)
 grubof_ASFLAGS = $(COMMON_ASFLAGS)
-grubof_LDFLAGS = -Wl,-Ttext,0x200000,-Bstatic
+grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-Ttext,0x200000,-Bstatic
 
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c
Index: kern/powerpc/ieee1275/init.c
===================================================================
RCS file: /cvsroot/grub/grub2/kern/powerpc/ieee1275/init.c,v
retrieving revision 1.2
diff -u -p -r1.2 init.c
--- kern/powerpc/ieee1275/init.c        4 Apr 2004 13:46:02 -0000       1.2
+++ kern/powerpc/ieee1275/init.c        6 Apr 2004 22:07:40 -0000
@@ -27,7 +27,7 @@
 #include <grub/normal.h>
 #include <grub/fs.h>
 #include <grub/setjmp.h>
-#include <env.h>
+#include <grub/env.h>
 
 void grub_ofdisk_init (void);
 void grub_console_init (void);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]