mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
We use different toolchain directories for different ARM archs, so we should set the default arch of gcc to reflect this.
This enables EABI support for armv4 CPUs. Signed-off-by: Jochen Friedrich <jochen@scram.de> SVN-Revision: 25705
This commit is contained in:
parent
5a8a9a0e23
commit
a3989e3dbd
18
rules.mk
18
rules.mk
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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) \
|
||||||
|
Loading…
Reference in New Issue
Block a user