From patchwork Tue Oct 21 20:27:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 401826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 4ACB3140076 for ; Wed, 22 Oct 2014 07:29:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0406EA1E80; Tue, 21 Oct 2014 20:29:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k9FZMBolx7no; Tue, 21 Oct 2014 20:29:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1FAEBA1E5B; Tue, 21 Oct 2014 20:29:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D01081BFA34 for ; Tue, 21 Oct 2014 20:29:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD47195451 for ; Tue, 21 Oct 2014 20:29:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VbGsnIftaIZ8 for ; Tue, 21 Oct 2014 20:29:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by hemlock.osuosl.org (Postfix) with ESMTP id 4FC219544F for ; Tue, 21 Oct 2014 20:29:28 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 1681E5042; Tue, 21 Oct 2014 22:29:29 +0200 (CEST) Received: from localhost (AToulouse-657-1-1059-39.w83-193.abo.wanadoo.fr [83.193.173.39]) by mail.free-electrons.com (Postfix) with ESMTPSA id AF8435023; Tue, 21 Oct 2014 22:27:43 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 21 Oct 2014 22:27:16 +0200 Message-Id: <1413923237-2861-30-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1413923237-2861-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1413923237-2861-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v2 29/30] toolchain-external: do not use BR2_GCC_TARGET_TUNE anymore X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- toolchain/toolchain-external/ext-toolchain-wrapper.c | 12 +++--------- toolchain/toolchain-external/toolchain-external.mk | 5 ----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index 8db4ac4..f459a7e 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -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)); diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index b7a0e60..e16fce5 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -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_)"'