From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Dec 2013 23:44:07 +0000 (+0100)
Subject: remove data32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7831929d32f11562567810e6c3ffd7a73ca04d2;p=thirdparty%2Fgrub.git

remove data32
---

diff --git a/acinclude.m4 b/acinclude.m4
index 32d5477d1..2ce95460b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -272,14 +272,11 @@ rm -f conftest*])
 
 if test "x$grub_cv_i386_asm_prefix_requirement" = xyes; then
   grub_tmp_addr32="addr32"
-  grub_tmp_data32="data32"
 else
   grub_tmp_addr32="addr32;"
-  grub_tmp_data32="data32;"
 fi
 
 ADDR32=$grub_tmp_addr32
-DATA32=$grub_tmp_data32
 
 AC_MSG_RESULT([$grub_cv_i386_asm_prefix_requirement])])
 
diff --git a/config.h.in b/config.h.in
index 4b6301441..229cfb89c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -33,8 +33,6 @@
 #define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
 /* Define it to \"addr32\" or \"addr32;\" to make GAS happy.  */
 #define ADDR32 @ADDR32@
-/* Define it to \"data32\" or \"data32;\" to make GAS happy. */
-#define DATA32 @DATA32@
 /* Define it to one of __bss_start, edata and _edata.  */
 #define BSS_START_SYMBOL @BSS_START_SYMBOL@
 /* Define it to either end or _end.  */
diff --git a/configure.ac b/configure.ac
index 77c942a29..1f70a0214 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1569,7 +1569,6 @@ AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
 
 AC_SUBST(HAVE_ASM_USCORE)
 AC_SUBST(ADDR32)
-AC_SUBST(DATA32)
 AC_SUBST(BSS_START_SYMBOL)
 AC_SUBST(END_SYMBOL)
 AC_SUBST(PACKAGE)
diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 279674030..812ff5494 100644
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -95,7 +95,7 @@ LOCAL (codestart):
 	int	$0x13
 
 	/* transition to protected mode */
-	DATA32	call real_to_prot
+	calll	real_to_prot
 
 	/* The ".code32" directive takes GAS out of 16-bit mode. */
 	.code32
@@ -149,7 +149,7 @@ gate_a20_try_bios:
 	movw	$0x2401, %ax
 	int	$0x15
 
-	DATA32	call	real_to_prot
+	calll	real_to_prot
 	.code32
 
 	popl	%ebp
diff --git a/grub-core/boot/i386/qemu/boot.S b/grub-core/boot/i386/qemu/boot.S
index bdd68c704..8d97fc18c 100644
--- a/grub-core/boot/i386/qemu/boot.S
+++ b/grub-core/boot/i386/qemu/boot.S
@@ -48,7 +48,7 @@ VARIABLE(grub_core_entry_addr)
 	/* Transition to protected mode.  We use pushl to force generation
 	   of a flat return address.  */
 	pushl	$1f
-	DATA32	jmp real_to_prot
+	jmpl	real_to_prot
 	.code32
 	/* Ensure A20 is enabled. We're in qemu, so control port A works
 	   and there is no need to wait since there is no real logic, it's
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index 6bb36c603..b8a9b33b4 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -135,7 +135,7 @@ LOCAL(prot_to_real_addr):
 
 	.macro REAL_TO_PROT
 	movl	LOCAL(real_to_prot_addr), %eax
-	DATA32	call	*%ax
+	calll	*%eax
 	.endm
 
 /*
diff --git a/grub-core/kern/i386/realmode.S b/grub-core/kern/i386/realmode.S
index 541cedc87..3eb85d7a3 100644
--- a/grub-core/kern/i386/realmode.S
+++ b/grub-core/kern/i386/realmode.S
@@ -54,7 +54,7 @@ protstack:
 	.endm
 
 	.macro REAL_TO_PROT
-	DATA32	call	real_to_prot
+	calll	real_to_prot
 	.endm
 
 /*
@@ -137,7 +137,7 @@ real_to_prot:
 	/* load the GDT register */
 	xorw	%ax, %ax
 	movw	%ax, %ds
-	DATA32	ADDR32	lgdt	gdtdesc
+	ADDR32	lgdtl	gdtdesc
 
 	/* turn on protected mode */
 	movl	%cr0, %eax
@@ -145,7 +145,7 @@ real_to_prot:
 	movl	%eax, %cr0
 
 	/* jump to relocation, flush prefetch queue, and reload %cs */
-	DATA32	ljmp	$GRUB_MEMORY_MACHINE_PROT_MODE_CSEG, $protcseg
+	ljmpl	$GRUB_MEMORY_MACHINE_PROT_MODE_CSEG, $protcseg
 
 	.code32
 protcseg:
@@ -237,7 +237,7 @@ tmpcseg:
 	movl	%eax, %cr0
 
 	/* flush prefetch queue, reload %cs */
-	DATA32	ljmp	$0, $realcseg
+	ljmpl	$0, $realcseg
 
 realcseg:
 	/* we are in real mode now
@@ -258,6 +258,6 @@ realcseg:
 #endif
 
 	/* return on new stack! */
-	DATA32	ret
+	retl
 
 	.code32
diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in
index d46b56c07..ac1db7cde 100644
--- a/grub-core/modinfo.sh.in
+++ b/grub-core/modinfo.sh.in
@@ -10,7 +10,6 @@ grub_have_font_source=@HAVE_FONT_SOURCE@
 # Autodetected config
 grub_have_asm_uscore=@HAVE_ASM_USCORE@
 grub_i8086_addr32="@ADDR32@"
-grub_i8086_data32="@DATA32@"
 grub_bss_start_symbol="@BSS_START_SYMBOL@"
 grub_end_symbol="@END_SYMBOL@"