From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, arm@kernel.org,
Arnd Bergmann <arnd@arndb.de>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Dave Martin <dave.martin@linaro.org>
Subject: [PATCH 16/16] ARM: pass -marm to gcc by default for both C and assembler
Date: Fri, 5 Oct 2012 16:55:30 +0200 [thread overview]
Message-ID: <1349448930-23976-17-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1349448930-23976-1-git-send-email-arnd@arndb.de>
The Linaro cross toolchain and probably others nowadays default to
building in THUMB2 mode. When building a kernel for a CPU that does
not support THUMB2, the compiler complains about incorrect flags.
We can work around this by setting -marm for all non-T2 builds.
Without this patch, building assabet_defconfig results in:
usr/initramfs_data.S:1:0: warning: target CPU does not support THUMB instructions [enabled by default]
arch/arm/nwfpe/entry.S:1:0: warning: target CPU does not support THUMB instructions [enabled by default]
firmware/cis/PCMLM28.cis.gen.S:1:0: warning: target CPU does not support THUMB instructions [enabled by default]
(and many more)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Dave Martin <dave.martin@linaro.org>
---
arch/arm/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a051dfb..4391427 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -21,8 +21,6 @@ endif
OBJCOPYFLAGS :=-O binary -R .comment -S
GZFLAGS :=-9
#KBUILD_CFLAGS +=-pipe
-# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
-KBUILD_CFLAGS +=$(call cc-option,-marm,)
# Never generate .eh_frame
KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm)
@@ -105,17 +103,20 @@ endif
ifeq ($(CONFIG_THUMB2_KERNEL),y)
AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)
AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
-CFLAGS_THUMB2 :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
-AFLAGS_THUMB2 :=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb
+CFLAGS_ISA :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
+AFLAGS_ISA :=$(CFLAGS_ISA) -Wa$(comma)-mthumb
# Work around buggy relocation from gas if requested:
ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
CFLAGS_MODULE +=-fno-optimize-sibling-calls
endif
+else
+CFLAGS_ISA :=$(call cc-option,-marm,)
+AFLAGS_ISA :=$(CFLAGS_ISA)
endif
# Need -Uarm for gcc < 3.x
-KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_THUMB2) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
-KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_THUMB2) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
+KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
+KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
CHECKFLAGS += -D__arm__
--
1.7.10
next prev parent reply other threads:[~2012-10-05 14:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349448930-23976-1-git-send-email-arnd@arndb.de>
2012-10-05 14:55 ` [PATCH 01/16] ARM: warnings in arch/arm/include/asm/uaccess.h Arnd Bergmann
2012-10-08 5:49 ` Greg Ungerer
2012-10-09 12:08 ` Arnd Bergmann
2012-10-05 14:55 ` [PATCH 02/16] ARM: binfmt_flat: unused variable 'persistent' Arnd Bergmann
2012-10-08 5:50 ` Greg Ungerer
2012-10-05 14:55 ` [PATCH 03/16] SCSI: ARM: ncr5380/oak uses no interrupts Arnd Bergmann
2012-10-05 14:55 ` [PATCH 04/16] SCSI: ARM: make fas216_dumpinfo function conditional Arnd Bergmann
2012-10-05 14:55 ` [PATCH 05/16] vfs: bogus warnings in fs/namei.c Arnd Bergmann
2012-10-08 11:51 ` Jan Kara
2012-10-09 12:27 ` Arnd Bergmann
2012-10-09 13:07 ` Arnd Bergmann
2012-10-09 13:43 ` Jan Kara
2012-10-11 4:37 ` Al Viro
2012-10-11 13:20 ` [PATCH v2] " Arnd Bergmann
2012-10-05 14:55 ` [PATCH 06/16] mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN Arnd Bergmann
2012-10-05 16:46 ` Christoph Lameter
2012-10-31 7:25 ` Pekka Enberg
2012-10-05 14:55 ` [PATCH 07/16] cgroup: fix warning when building without any subsys Arnd Bergmann
2012-10-05 15:50 ` Ben Blum
2012-10-06 2:14 ` Tejun Heo
2012-10-06 6:19 ` Arnd Bergmann
2012-10-05 14:55 ` [PATCH 08/16] ipvs: fix ip_vs_set_timeout debug messages Arnd Bergmann
2012-10-05 20:39 ` Julian Anastasov
2012-10-06 6:45 ` Arnd Bergmann
2012-10-06 8:09 ` Julian Anastasov
2012-10-06 9:54 ` Arnd Bergmann
2012-10-09 1:48 ` Simon Horman
2012-10-05 14:55 ` [PATCH 09/16] USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit Arnd Bergmann
2012-10-05 18:05 ` Alan Stern
2012-10-05 14:55 ` [PATCH 10/16] clk: don't mark clkdev_add_table as init Arnd Bergmann
2012-10-05 14:55 ` [PATCH 11/16] pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops Arnd Bergmann
2012-10-05 14:55 ` [PATCH 12/16] video: mark nuc900fb_map_video_memory as __devinit Arnd Bergmann
2012-10-05 14:55 ` [PATCH 13/16] ARM: be really quiet when building with 'make -s' Arnd Bergmann
2012-10-05 16:36 ` Nicolas Pitre
2012-10-05 14:55 ` [PATCH 14/16] ARM: pxa: armcore: fix PCI PIO warnings Arnd Bergmann
2012-10-05 15:32 ` Igor Grinberg
2012-10-05 14:55 ` [PATCH 15/16] spi/s3c64xx: use correct dma_transfer_direction type Arnd Bergmann
2012-10-05 14:55 ` Arnd Bergmann [this message]
2012-10-05 18:42 ` [PATCH 16/16] ARM: pass -marm to gcc by default for both C and assembler Nicolas Pitre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349448930-23976-17-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=dave.martin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome