From: Thomas Petazzoni Date: Sun, 23 Sep 2018 22:38:49 +0200 Subject: [Buildroot] [PATCH 1/2] arch: drop BR2_GCC_TARGET_CPU_REVISION option In-Reply-To: <20180923203850.19447-1-thomas.petazzoni@bootlin.com> References: <20180923203850.19447-1-thomas.petazzoni@bootlin.com> Message-ID: <20180923203850.19447-2-thomas.petazzoni@bootlin.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net In commit 325bb37942f8d3826dab9dc6e88b25234e67a2cf, support for the Blackfin architecture was removed. This was our only use of BR2_GCC_TARGET_CPU_REVISION, and since this config option somewhat complicates the calculation of the --with-cpu/-mcpu option values, let's drop it. Signed-off-by: Thomas Petazzoni --- arch/Config.in | 3 --- arch/arch.mk | 1 - package/gcc/gcc.mk | 4 ---- toolchain/toolchain-external/pkg-toolchain-external.mk | 4 ---- 4 files changed, 12 deletions(-) diff --git a/arch/Config.in b/arch/Config.in index 7d1aeb2174..bf94beb289 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -306,9 +306,6 @@ config BR2_GCC_TARGET_FP32_MODE config BR2_GCC_TARGET_CPU string -config BR2_GCC_TARGET_CPU_REVISION - string - # The value of this option will be passed as --with-fpu= when # building gcc (internal backend) or -mfpu= in the toolchain # wrapper (external toolchain) diff --git a/arch/arch.mk b/arch/arch.mk index 2429567b24..dcd583a01e 100644 --- a/arch/arch.mk +++ b/arch/arch.mk @@ -8,7 +8,6 @@ GCC_TARGET_ABI := $(call qstrip,$(BR2_GCC_TARGET_ABI)) GCC_TARGET_NAN := $(call qstrip,$(BR2_GCC_TARGET_NAN)) GCC_TARGET_FP32_MODE := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE)) GCC_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)) -GCC_TARGET_CPU_REVISION := $(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)) GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 5f6d53f106..9e9069ce0e 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -215,12 +215,8 @@ ifneq ($(GCC_TARGET_FP32_MODE),) HOST_GCC_COMMON_CONF_OPTS += --with-fp-32="$(GCC_TARGET_FP32_MODE)" endif ifneq ($(GCC_TARGET_CPU),) -ifneq ($(GCC_TARGET_CPU_REVISION),) -HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(GCC_TARGET_CPU)-$(GCC_TARGET_CPU_REVISION) -else HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(GCC_TARGET_CPU) endif -endif ifneq ($(GCC_TARGET_FPU),) HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 08e61af00b..241a39a5ee 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -151,11 +151,7 @@ TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) # Definition of the CFLAGS to use with the external toolchain, as well as the # common toolchain wrapper build arguments # -ifeq ($(GCC_TARGET_CPU_REVISION),) CC_TARGET_CPU_ := $(GCC_TARGET_CPU) -else -CC_TARGET_CPU_ := $(GCC_TARGET_CPU)-$(GCC_TARGET_CPU_REVISION) -endif CC_TARGET_ARCH_ := $(GCC_TARGET_ARCH) CC_TARGET_ABI_ := $(GCC_TARGET_ABI) CC_TARGET_NAN_ := $(GCC_TARGET_NAN) -- 2.14.4