Commit d7745517 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

arch: introduce BR2_GCC_TARGET_{FPU, FLOAT_ABI} 



Buildroot already has the BR2_GCC_TARGET_{TUNE,ARCH,ABI,CPU} hidden
kconfig strings that allow per-architecture Config.in files to feed
the appropriate values of --with-{tune,arch,abi-cpu} when building
gcc, or the appropriate flags for the external toolchain wrapper.

This commit has two additional options:
BR2_GCC_TARGET_{FPU,FLOAT_ABI}, that allows to define the
--with-{fpu,float} gcc configure options for the internal backend, or
the -m{fpu,float-abi} options for the flags of the external toolchain
wrapper.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 3c71b90c

arch/Config.in

+12 −0
Original line number Diff line number Diff line
@@ -192,6 +192,18 @@ config BR2_GCC_TARGET_CPU 
config BR2_GCC_TARGET_CPU_REVISION

	string



# The value of this option will be passed as --with-fpu=<value> when

# building gcc (internal backend) or -mfpu=<value> in the toolchain

# wrapper (external toolchain)

config BR2_GCC_TARGET_FPU

	string



# The value of this option will be passed as --with-float=<value> when

# building gcc (internal backend) or -mfloat-abi=<value> in the toolchain

# wrapper (external toolchain)

config BR2_GCC_TARGET_FLOAT_ABI

	string



# Set up target binary format

choice

	prompt "Target Binary Format"

package/gcc/gcc.mk

+10 −0
Original line number Diff line number Diff line
@@ -167,6 +167,16 @@ HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)) 
endif

endif



GCC_TARGET_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU))

ifneq ($(GCC_TARGET_FPU),)

HOST_GCC_COMMON_CONF_OPT += --with-fpu=$(GCC_TARGET_FPU)

endif



GCC_TARGET_FLOAT_ABI = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))

ifneq ($(GCC_TARGET_FLOAT_ABI),)

HOST_GCC_COMMON_CONF_OPT += --with-float=$(GCC_TARGET_FLOAT_ABI)

endif



# Branding works on >= 4.3

ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)

HOST_GCC_COMMON_CONF_OPT += \

toolchain/toolchain-external/ext-tool.mk

+10 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISIO 
endif

CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))

CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))

CC_TARGET_FPU_:=$(call qstrip,$(BR2_GCC_TARGET_FPU))

CC_TARGET_FLOAT_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))



# march/mtune/floating point mode needs to be passed to the external toolchain

# to select the right multilib variant
@@ -168,6 +170,14 @@ ifneq ($(CC_TARGET_ABI_),) 
TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'

endif

ifneq ($(CC_TARGET_FPU_),)

TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_)

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"'

endif

ifneq ($(CC_TARGET_FLOAT_ABI_),)

TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(CC_TARGET_FLOAT_ABI_)

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(CC_TARGET_FLOAT_ABI_)"'

endif

ifeq ($(BR2_BINFMT_FLAT),y)

TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt

TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT

toolchain/toolchain-external/ext-toolchain-wrapper.c

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ static char *predef_args[] = { 
#ifdef BR_ABI

	"-mabi=" BR_ABI,

#endif

#ifdef BR_FLOAT_ABI

	"-mfloat-abi=" BR_FLOAT_ABI,

#endif

#ifdef BR2_FPU

	"-mfpu=" BR_FPU,

#endif

#ifdef BR_SOFTFLOAT

	"-msoft-float",

#endif /* BR_SOFTFLOAT */