diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/arm/Makefile | |
parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 24e0f0187697..e7ef876e574b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -85,6 +85,10 @@ else | |||
85 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) | 85 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) |
86 | endif | 86 | endif |
87 | 87 | ||
88 | ifeq ($(CONFIG_ARM_UNWIND),y) | ||
89 | CFLAGS_ABI +=-funwind-tables | ||
90 | endif | ||
91 | |||
88 | # Need -Uarm for gcc < 3.x | 92 | # Need -Uarm for gcc < 3.x |
89 | KBUILD_CFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm | 93 | KBUILD_CFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm |
90 | KBUILD_AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float | 94 | KBUILD_AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float |