2006-07-02 Jeroen Dekkers <jeroen@dekkers.cx>

	* conf/i386-pc.rmk (COMMON_ASFLAGS): Add "-m32".
	(normal_mod_ASFLAGS): Remove "-m32".

diff --git a/ChangeLog b/ChangeLog
index dffb7f53856cd1de2754179ce872e040a316a18a..d7ccbae7339feda223d4d5d14ef81245d912b259 100644 (file)
--- 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 e6e3cbc91bf0b82b20f6252f0725d8a50e2963f3..b2a045fb8ffb698cab151e5edf2d48be145f9db8 100644 (file)
--- 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.