toolchain-external: do not use BR2_GCC_TARGET_TUNE anymore
Since the BR2_GCC_TARGET_TUNE value is always empty now, there is no longer a point in using it in the external toolchain logic. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
c0b2c5985a
commit
5715d2dcf4
|
@ -33,10 +33,9 @@ static char sysroot[PATH_MAX];
|
||||||
* Currently, we have:
|
* Currently, we have:
|
||||||
* -mfloat-abi=
|
* -mfloat-abi=
|
||||||
* -march=
|
* -march=
|
||||||
* -mtune=
|
|
||||||
* -mcpu=
|
* -mcpu=
|
||||||
*/
|
*/
|
||||||
#define EXCLUSIVE_ARGS 4
|
#define EXCLUSIVE_ARGS 3
|
||||||
|
|
||||||
static char *predef_args[] = {
|
static char *predef_args[] = {
|
||||||
path,
|
path,
|
||||||
|
@ -154,14 +153,12 @@ int main(int argc, char **argv)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(BR_ARCH) || \
|
#if defined(BR_ARCH) || \
|
||||||
defined(BR_TUNE) || \
|
|
||||||
defined(BR_CPU)
|
defined(BR_CPU)
|
||||||
/* Add our -march/cpu/tune/abi flags, but only if none are
|
/* Add our -march/cpu/abi flags, but only if none are
|
||||||
* already specified on the commandline
|
* already specified on the commandline
|
||||||
*/
|
*/
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
if (!strncmp(argv[i], "-march=", strlen("-march=")) ||
|
if (!strncmp(argv[i], "-march=", strlen("-march=")) ||
|
||||||
!strncmp(argv[i], "-mtune=", strlen("-mtune=")) ||
|
|
||||||
!strncmp(argv[i], "-mcpu=", strlen("-mcpu=" )))
|
!strncmp(argv[i], "-mcpu=", strlen("-mcpu=" )))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -169,14 +166,11 @@ int main(int argc, char **argv)
|
||||||
#ifdef BR_ARCH
|
#ifdef BR_ARCH
|
||||||
*cur++ = "-march=" BR_ARCH;
|
*cur++ = "-march=" BR_ARCH;
|
||||||
#endif
|
#endif
|
||||||
#ifdef BR_TUNE
|
|
||||||
*cur++ = "-mtune=" BR_TUNE;
|
|
||||||
#endif
|
|
||||||
#ifdef BR_CPU
|
#ifdef BR_CPU
|
||||||
*cur++ = "-mcpu=" BR_CPU;
|
*cur++ = "-mcpu=" BR_CPU;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif /* ARCH || TUNE || CPU */
|
#endif /* ARCH || CPU */
|
||||||
|
|
||||||
/* append forward args */
|
/* append forward args */
|
||||||
memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));
|
memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));
|
||||||
|
|
|
@ -163,7 +163,6 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
|
||||||
-DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"'
|
-DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CC_TARGET_TUNE_ := $(call qstrip,$(BR2_GCC_TARGET_TUNE))
|
|
||||||
ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
|
ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
|
||||||
CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU))
|
CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU))
|
||||||
else
|
else
|
||||||
|
@ -181,10 +180,6 @@ ifeq ($(BR2_x86_64),y)
|
||||||
TOOLCHAIN_EXTERNAL_CFLAGS += -m64
|
TOOLCHAIN_EXTERNAL_CFLAGS += -m64
|
||||||
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_64
|
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_64
|
||||||
endif
|
endif
|
||||||
ifneq ($(CC_TARGET_TUNE_),)
|
|
||||||
TOOLCHAIN_EXTERNAL_CFLAGS += -mtune=$(CC_TARGET_TUNE_)
|
|
||||||
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_TUNE='"$(CC_TARGET_TUNE_)"'
|
|
||||||
endif
|
|
||||||
ifneq ($(CC_TARGET_ARCH_),)
|
ifneq ($(CC_TARGET_ARCH_),)
|
||||||
TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_)
|
TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_)
|
||||||
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"'
|
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"'
|
||||||
|
|
Loading…
Reference in New Issue