gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Thomas Petazzoni 2014-10-21 22:27:16 +02:00 committed by Peter Korsgaard
parent c0b2c5985a
commit 5715d2dcf4
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolchain/toolchain-external/ext-toolchain-wrapper.c
View File

@ -33,10 +33,9 @@ static char sysroot[PATH_MAX];
* Currently, we have:
* -mfloat-abi=
* -march=
* -mtune=
* -mcpu=
*/
#define EXCLUSIVE_ARGS 4
#define EXCLUSIVE_ARGS 3
static char *predef_args[] = {
path,
@ -154,14 +153,12 @@ int main(int argc, char **argv)
#endif
#if defined(BR_ARCH) || \
defined(BR_TUNE) || \
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
*/
for (i = 1; i < argc; i++) {
if (!strncmp(argv[i], "-march=", strlen("-march=")) ||
!strncmp(argv[i], "-mtune=", strlen("-mtune=")) ||
!strncmp(argv[i], "-mcpu=", strlen("-mcpu=" )))
break;
}
@ -169,14 +166,11 @@ int main(int argc, char **argv)
#ifdef BR_ARCH
*cur++ = "-march=" BR_ARCH;
#endif
#ifdef BR_TUNE
*cur++ = "-mtune=" BR_TUNE;
#endif
#ifdef BR_CPU
*cur++ = "-mcpu=" BR_CPU;
#endif
}
#endif /* ARCH || TUNE || CPU */
#endif /* ARCH || CPU */
/* append forward args */
memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));

5
toolchain/toolchain-external/toolchain-external.mk
View File

@ -163,7 +163,6 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
-DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"'
endif
CC_TARGET_TUNE_ := $(call qstrip,$(BR2_GCC_TARGET_TUNE))
ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU))
else
@ -181,10 +180,6 @@ ifeq ($(BR2_x86_64),y)
TOOLCHAIN_EXTERNAL_CFLAGS += -m64
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_64
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_),)
TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_)
TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"'