From: George G. Davis <gdavis@mvista.com>
Date: Tue, 5 Dec 2006 17:28:04 +0000 (+0100)
Subject: [ARM] 3982/2: Explicitly select 32-bit ARM ISA (-marm)
X-Git-Tag: v2.6.20-rc1~34^2~412^2~1^2^3~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5636810d6f17493717ef0f03efc0315026db934d;p=linux-2.6

[ARM] 3982/2: Explicitly select 32-bit ARM ISA (-marm)

Do not assume that the ARM GCC toolchain defaults to building for the
32-bit ARM ISA (-marm) case. Instead, explicitly select -marm in CFLAGS
since the toolchain default can be for the 16-bit Thumb ISA (-mthumb) in
some odd/rare cases.

Signed-off-by: George G. Davis <gdavis@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6f4f8bf360..b6001f97c8 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -15,6 +15,8 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
 OBJCOPYFLAGS	:=-O binary -R .note -R .comment -S
 GZFLAGS		:=-9
 #CFLAGS		+=-pipe
+# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
+CFLAGS		+=$(call cc-option,-marm,)
 
 # Do not use arch/arm/defconfig - it's always outdated.
 # Select a platform tht is kept up-to-date