On Sat, May 30, 2009 at 4:39 PM, Vladimir 'phcoder' Serbinenko
<phco...@gmail.com> wrote:
> Hello. Here begins series of patches to make grub2 compile with
> apple's toolchain. It's actually just a split of previous patch. As
> there were no opposition to previous patch I will commit this series
> soon if nobody opposes
>
Patch was reversed
> --
> Regards
> Vladimir 'phcoder' Serbinenko
>
--
Regards
Vladimir 'phcoder' Serbinenko
diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 8056731..9ccfbca 100644
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -390,11 +390,11 @@ general_error:
int $0x18
stop: jmp stop
-notification_string: .string "GRUB "
-geometry_error_string: .string "Geom"
-hd_probe_error_string: .string "Hard Disk"
-read_error_string: .string "Read"
-general_error_string: .string " Error"
+notification_string: .asciz "GRUB "
+geometry_error_string: .asciz "Geom"
+hd_probe_error_string: .asciz "Hard Disk"
+read_error_string: .asciz "Read"
+general_error_string: .asciz " Error"
/*
* message: write the string pointed to by %si
@@ -464,7 +464,8 @@ probe_loop:
MSG(fd_probe_error_string)
jmp general_error
-fd_probe_error_string: .string "Floppy"
+/* "Floppy" */
+fd_probe_error_string: .asciz "Floppy"
1:
/* perform read */
diff --git a/boot/i386/pc/diskboot.S b/boot/i386/pc/diskboot.S
index 95f87a0..0c8e75d 100644
--- a/boot/i386/pc/diskboot.S
+++ b/boot/i386/pc/diskboot.S
@@ -326,14 +326,14 @@ general_error:
/* go here when you need to stop the machine hard after an error condition */
stop: jmp stop
-notification_string: .string "loading"
+notification_string: .asciz "loading"
-notification_step: .string "."
-notification_done: .string "\r\n"
+notification_step: .asciz "."
+notification_done: .asciz "\r\n"
-geometry_error_string: .string "Geom"
-read_error_string: .string "Read"
-general_error_string: .string " Error"
+geometry_error_string: .asciz "Geom"
+read_error_string: .asciz "Read"
+general_error_string: .asciz " Error"
/*
* message: write the string pointed to by %si
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 4ff6240..55f5d4e 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -41,10 +41,10 @@ static void \
grub_mod_fini (void)
#define GRUB_MOD_NAME(name) \
-__asm__ (".section .modname\n.string \"" #name "\"\n")
+__asm__ (".section .modname\n.asciz \"" #name "\"\n")
#define GRUB_MOD_DEP(name) \
-__asm__ (".section .moddeps\n.string \"" #name "\"\n")
+__asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
struct grub_dl_segment
{
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
