From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1ECCC1A1E00 for ; Thu, 11 Aug 2016 04:14:27 -0700 (PDT) Received: by mail-wm0-x235.google.com with SMTP id f65so22918115wmi.0 for ; Thu, 11 Aug 2016 04:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D26Yt34WRE9M7nUYs7SjLXr5ZXuIOv6ihq+o2aZnwIk=; b=PRc/HThMtyTU/go1SO2tXhV00cB/JD/TiInw/vVCVhnE43nlFp0oUwfQpVOijLY9cq MiNaLbKPnduPEt+yFUH9latjApCEifA0joKr2y4RMM0tndMRHs7dIhagVca88Eym3cxt wZhxf4KfVro1SNBijLv6xKdT3dt4QCDB38n58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=D26Yt34WRE9M7nUYs7SjLXr5ZXuIOv6ihq+o2aZnwIk=; b=HjUUUAkaSxM2zzzRhlikNRREzwTSMWuNwu0x56HgRdIhwY8GcfeOqK0YiFzfAhN9dU Jo+7W+TeEdbvo67vNckAWweoBakp4Rcn40BdRgXYU6254yuO0GT1ZteRyigZGNYeUFq1 QWHqfwEaCygISY+Xc7bMtVmb5jWbXsrHo5N68n0BArid/qJwvIfUb+zfjRPTIIYDROnM EC3IcnS+Zly5nlr0LD92OeY8fw8YlvZi9zx0m8TtJk75KdnYTzF+lCw5k9k+YTsf32fJ tSwjcX/3ogGlyz8KaLVrgIXiiEMAh9D7JEEUQLSfjP+r2hl1ZOQEq1oht1yM2oKXIQQx 3S9A== X-Gm-Message-State: AEkooutLBYuhUtx82zJ961v7YX7AFT2fLFAu2PBDjX3V+EeGbNaoHnJ6K7X22TdEhxk5Tnpz X-Received: by 10.28.32.15 with SMTP id g15mr8048688wmg.25.1470914065694; Thu, 11 Aug 2016 04:14:25 -0700 (PDT) Received: from localhost.localdomain (46.red-81-37-107.dynamicip.rima-tde.net. [81.37.107.46]) by smtp.gmail.com with ESMTPSA id q23sm2675034wme.17.2016.08.11.04.14.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Aug 2016 04:14:25 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, liming.gao@intel.com, yonghong.zhu@intel.com Cc: Ard Biesheuvel Date: Thu, 11 Aug 2016 13:14:15 +0200 Message-Id: <1470914055-28034-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470914055-28034-1-git-send-email-ard.biesheuvel@linaro.org> References: <1470914055-28034-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [PATCH 2/2] BaseTools ARM AARCH64: drop redundant compiler arguments X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Aug 2016 11:14:27 -0000 The ARM and AARCH64 CC_FLAGS definitions include both GCC_ALL_CC_FLAGS and GCC44_ALL_CC_FLAGS, resulting in many of the compiler arguments being passed twice. Since the CLANG35 definitions do not refer to GCC44_ALL_CC_FLAGS, drop the reference for GCCx as well. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 2002c4c0598b..d6d3ed380668 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4400,7 +4400,7 @@ DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS) DEFINE GCC46_X64_DLINK2_FLAGS = DEF(GCC45_X64_DLINK2_FLAGS) DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS) DEFINE GCC46_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian -DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations -save-temps +DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations -save-temps DEFINE GCC46_ARM_CC_XIPFLAGS = -D__ARM_FEATURE_UNALIGNED=0 DEFINE GCC46_ARM_DLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--oformat=elf32-littlearm DEFINE GCC46_ARM_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 @@ -4419,7 +4419,7 @@ DEFINE GCC47_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS) DEFINE GCC47_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian DEFINE GCC47_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) DEFINE GCC47_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) -DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) -save-temps +DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) -save-temps DEFINE GCC47_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) DEFINE GCC47_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS) DEFINE GCC47_ARM_DLINK2_FLAGS = DEF(GCC46_ARM_DLINK2_FLAGS) -- 2.7.4