From 4e584f2cfca12e98158e360030de1e3737d0132a Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Tue, 26 Sep 2006 10:52:37 +0200
Subject: [PATCH] --- yaml --- r: 35920 b: refs/heads/master c:
 b3698c03eb6d4581e879d6bb0f183ed8dda96d37 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86_64/boot/compressed/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 468e6d34a168..7e769aa22b2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef
+refs/heads/master: b3698c03eb6d4581e879d6bb0f183ed8dda96d37
diff --git a/trunk/arch/x86_64/boot/compressed/Makefile b/trunk/arch/x86_64/boot/compressed/Makefile
index f89d96f11a9f..e70fa6e1da08 100644
--- a/trunk/arch/x86_64/boot/compressed/Makefile
+++ b/trunk/arch/x86_64/boot/compressed/Makefile
@@ -7,7 +7,8 @@
 #
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS	:= -traditional -m32
+EXTRA_AFLAGS	:= -traditional
+AFLAGS		:= $(subst -m64,-m32,$(AFLAGS))
 
 # cannot use EXTRA_CFLAGS because base CFLAGS contains -mkernel which conflicts with
 # -m32