2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>

	Use .asciz instead of .string

	* i386/pc/diskboot.S: use .asciz instead of .string
	* i386/pc/boot.S: likewise
	* include/grub/dl.h (GRUB_MOD_DEP): likewise
	(GRUB_MOD_NAME): likewise

diff --git a/ChangeLog b/ChangeLog
index 23f629638729415b15f190f4458bc839ae5bbfb4..836e0c16e0fb560b9a82b177e2e2051f56b998c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Use .asciz instead of .string
+
+       * i386/pc/diskboot.S: use .asciz instead of .string
+       * i386/pc/boot.S: likewise
+       * include/grub/dl.h (GRUB_MOD_DEP): likewise
+       (GRUB_MOD_NAME): likewise
+       
 2009-06-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        gfxpayload support

diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 8056731213922d3dc03e2b6806abf804bf16ba4b..9ccfbcaa42ae27dbeac317e1ea6d78b071109a0d 100644 (file)
--- 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 95f87a035fad2f833bb0ea8a50c5a99209d6f430..0c8e75df00024530c13be847465ab5127070ad7e 100644 (file)
--- 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 4ff6240d81fe206bb5ead4631b1e84d755ed9742..55f5d4e22ac93d1b7b11522d27199238c2854d40 100644 (file)
--- 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
 {