- unify the GCC_WITH_ configure options and make them active
This commit is contained in:
parent
c779748845
commit
9fbb109506
@ -47,6 +47,19 @@ else # no softfloat support
|
||||
SOFT_FLOAT_CONFIG_OPTION:=
|
||||
TARGET_SOFT_FLOAT:=
|
||||
ARCH_FPU_SUFFIX:=
|
||||
# some additional defaults
|
||||
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ARCH))),)
|
||||
# ")))
|
||||
GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
|
||||
endif
|
||||
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_TUNE))),)
|
||||
# ")))
|
||||
GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
|
||||
endif
|
||||
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ABI))),)
|
||||
# ")))
|
||||
GCC_WITH_ABI:=--with-tune=$(BR2_GCC_TARGET_ABI)
|
||||
endif
|
||||
endif
|
||||
|
||||
TARGET_GCC_FLAGS= CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
||||
|
@ -173,7 +173,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS));
|
||||
touch $@
|
||||
|
||||
@ -233,7 +233,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS));
|
||||
@ -366,7 +366,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS) \
|
||||
@ -400,10 +400,6 @@ GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION)
|
||||
else
|
||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
||||
endif
|
||||
#XXX: FIXME: cleanup BR2_ARCH selection and establish BR2_CPU
|
||||
#GCC_WITH_ARCH=--with-arch=$(BR2_ARCH)
|
||||
#GCC_WITH_TUNE=--with-tune=$(BR2_ARCH)
|
||||
#GCC_WITH_CPU=--with-cpu=$(BR2_ARCH)
|
||||
endif
|
||||
|
||||
$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
|
||||
|
@ -170,7 +170,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS));
|
||||
touch $@
|
||||
|
||||
@ -231,7 +231,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS));
|
||||
@ -366,7 +366,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
||||
$(THREADS) \
|
||||
$(MULTILIB) \
|
||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||
$(GCC_WITH_CPU) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
|
||||
$(GCC_USE_SJLJ_EXCEPTIONS) \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(EXTRA_GCC_CONFIG_OPTIONS) \
|
||||
@ -400,10 +400,6 @@ GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION)
|
||||
else
|
||||
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
|
||||
endif
|
||||
#XXX: FIXME: cleanup BR2_ARCH selection and establish BR2_CPU
|
||||
#GCC_WITH_ARCH=--with-arch=$(BR2_ARCH)
|
||||
#GCC_WITH_TUNE=--with-tune=$(BR2_ARCH)
|
||||
#GCC_WITH_CPU=--with-cpu=$(BR2_ARCH)
|
||||
endif
|
||||
|
||||
$(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
|
||||
|
Loading…
Reference in New Issue
Block a user