From 5389763d12502820dff1e428f000cd2c77b50d12 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@localhost>
Date: Thu, 4 Jun 2009 19:28:02 +0000
Subject: [PATCH] 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
---
 ChangeLog               |  9 +++++++++
 boot/i386/pc/boot.S     | 13 +++++++------
 boot/i386/pc/diskboot.S | 12 ++++++------
 include/grub/dl.h       |  4 ++--
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23f629638..836e0c16e 100644
--- 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 805673121..9ccfbcaa4 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 95f87a035..0c8e75df0 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 4ff6240d8..55f5d4e22 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
 {