From 43e7f879aec603d393328635f990ae3bd3795656 Mon Sep 17 00:00:00 2001
From: jeroen <jeroen@localhost>
Date: Sun, 2 Jul 2006 15:30:43 +0000
Subject: [PATCH] 2006-07-02  Jeroen Dekkers  <jeroen@dekkers.cx>

	* conf/i386-pc.rmk (COMMON_ASFLAGS): Add "-m32".
	(normal_mod_ASFLAGS): Remove "-m32".
---
 ChangeLog        | 5 +++++
 conf/i386-pc.rmk | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dffb7f538..d7ccbae73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-02  Jeroen Dekkers  <jeroen@dekkers.cx>
+
+	* conf/i386-pc.rmk (COMMON_ASFLAGS): Add "-m32".
+	(normal_mod_ASFLAGS): Remove "-m32".
+
 2006-06-14  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* util/misc.c: Include config.h.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index e6e3cbc91..b2a045fb8 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin
+COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -melf_i386 -nostdlib
 
@@ -141,7 +141,7 @@ normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c	\
 	normal/menu_entry.c normal/misc.c grub_script.tab.c 		\
 	normal/script.c normal/i386/setjmp.S
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
-normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
+normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For reboot.mod.