KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

We use different toolchain directories for different ARM archs, so we should set the default arch of gcc to reflect this.

Browse source 
This enables EABI support for armv4 CPUs.

Signed-off-by: Jochen Friedrich <jochen@scram.de>

SVN-Revision: 25705
This commit is contained in:
Imre Kaloz 2011-02-25 16:52:25 +00:00
parent 5a8a9a0e23
commit a3989e3dbd
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rules.mk
View file

@ -54,21 +54,15 @@ endif
HOST_FPIC:=-fPIC HOST_FPIC:=-fPIC
ARCH_SUFFIX:= ARCH_SUFFIX:=
GCC_ARCH:=
ifneq ($(filter -march=armv%,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_$(patsubst -march=arm%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION)))
GCC_ARCH:=$(patsubst -march=%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION)))
endif
ifneq ($(findstring -mips32r2,$(TARGET_OPTIMIZATION)),) ifneq ($(findstring -mips32r2,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_r2 ARCH_SUFFIX:=_r2
endif endif
ifneq ($(findstring -march=armv4,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_v4
endif
ifneq ($(findstring -march=armv4t,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_v4t
endif
ifneq ($(findstring -march=armv5t,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_v5t
endif
ifneq ($(findstring -march=armv5te,$(TARGET_OPTIMIZATION)),)
ARCH_SUFFIX:=_v5te
endif
ifdef CONFIG_HAS_SPE_FPU ifdef CONFIG_HAS_SPE_FPU
TARGET_SUFFIX:=$(TARGET_SUFFIX)spe TARGET_SUFFIX:=$(TARGET_SUFFIX)spe
endif endif

2
toolchain/Config.in
View file

@ -90,8 +90,6 @@ config EABI_SUPPORT
bool bool
depends arm||armeb depends arm||armeb
prompt "Enable EABI support" if TOOLCHAINOPTS prompt "Enable EABI support" if TOOLCHAINOPTS
default n if TARGET_gemini
default n if TARGET_cns21xx
default y default y
help help
Enable ARM EABI support Enable ARM EABI support

4
toolchain/gcc/common.mk
View file

@ -167,6 +167,10 @@ ifdef CONFIG_powerpc
TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS)) TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS))
endif endif
ifneq ($(GCC_ARCH),)
GCC_CONFIGURE+= --with-arch=$(GCC_ARCH)
endif
GCC_MAKE:= \ GCC_MAKE:= \
export SHELL="$(BASH)"; \ export SHELL="$(BASH)"; \
$(MAKE) $(TOOLCHAIN_JOBS) \ $(MAKE) $(TOOLCHAIN_JOBS) \