From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web08.7049.1635846917809126687 for ; Tue, 02 Nov 2021 02:55:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=Omm06j3w; spf=pass (domain: nuviainc.com, ip: 209.85.128.49, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f49.google.com with SMTP id b184-20020a1c1bc1000000b0033140bf8dd5so1610320wmb.5 for ; Tue, 02 Nov 2021 02:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=1ppYHMXHk5DSgAzyySGohEHYQnV2WBkqkBoghBPzp2A=; b=Omm06j3wIoaeCwBDSQr1ExZ4gs+hK54V5OaswsJ40B7Ku3NtjEn6wQT1H99rOEdZEn q/2fxJzlpvzHIo1sJ7s0Hvcte3lDUehue6AL+GYguKRDhDvJrloENbv+aTniefaaupsR W+LUWgxQnvZeoUUrlsph8x9CIvQkK1ptDSWWbHSNKcPjxGKSjK1veT3C8qaFXoWdakAs /Xpr0pXhR6NrgWz++jnHc/ItHTKkG9pgWcq1qybW+6rs+oO0lB7uwXwk9EyFGuolqSwh PzLPcHhvKXcC3niJi5YzjyT332/5zZV0D/8uMcsJEpnOlHuA+3+AodhpljNgUFtkfbli b2rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1ppYHMXHk5DSgAzyySGohEHYQnV2WBkqkBoghBPzp2A=; b=A0MqfmHlsNHAhzgfktSfZ8j7AsGHKYHw8w/s8E8wRLveaT3Qtpwwh6rKYaqFwPyOZM KWVluSTmv+iWkzabZI2U5e1lzcro4LpFDrIAq6Ggln1lOIdRtvzpNkwHjxMqSkY8rOZ9 CKVe3ZOAdRtrmBdSJHCs98IqGClBeCTsZEQ2vsbs5orCcfkMLXSaQ9UutAXbnBLZeTT1 jw43r7WTBrKZLlrtu3JteHQELpGOaYeIBW1bZELyiVi2Mbu3JN+idBXX40mDCUJPULf2 BINlBC84bMjI+XDFf2xwW1UzOF2h0x84JqBEXJRclTr3nXPvEForaxhuG4o/TqwwBQuP rBpw== X-Gm-Message-State: AOAM533reU0/nHtZtgIN5N0cFu/PsHz5LxgYr3H3t/YH4XtBj2frbbsW 1GU8JDvgGTI5OnKjf1twmdlSkkU/ZZUYmKQ7 X-Google-Smtp-Source: ABdhPJzvGfPKjE0nOtGYP2HdIMDHX4UjuhAI/Zhnhv1bHyfHdlKLWLrxlYRTx4Mw0xR5odNlpUwg6Q== X-Received: by 2002:a1c:7ed3:: with SMTP id z202mr5651379wmc.110.1635846916144; Tue, 02 Nov 2021 02:55:16 -0700 (PDT) Return-Path: Received: from leviathan (cpc92314-cmbg19-2-0-cust559.5-4.cable.virginm.net. [82.11.186.48]) by smtp.gmail.com with ESMTPSA id a1sm8296351wri.89.2021.11.02.02.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 02:55:15 -0700 (PDT) Date: Tue, 2 Nov 2021 09:55:14 +0000 From: "Leif Lindholm" To: "brbarkel@microsoft.com" Cc: devel@edk2.groups.io, Ard Biesheuvel , Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan Subject: Re: [PATCH v1 06/16] ArmPkg and BaseTools: Move the GccLto binaries from ArmPkg to BaseTools Message-ID: <20211102095514.o5ermrxjikklgy3n@leviathan> References: <20211101195648.6420-1-brbarkel@microsoft.com> <20211101195648.6420-7-brbarkel@microsoft.com> MIME-Version: 1.0 In-Reply-To: <20211101195648.6420-7-brbarkel@microsoft.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Nov 01, 2021 at 12:56:38 -0700, brbarkel@microsoft.com wrote: > From: Bret Barkelew > > This aligns better with Mu's philosophy around dependency structuring > and is one of the steps to enable Basecore to have zero CI dependencies > on other Mu repos. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3650 > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > Cc: Sean Brogan > Signed-off-by: Bret Barkelew No objections to this for any of my use-cases, but I'd like for one of the BaseTools maintainers to comment on whether this breaks anything with regards to EDK_TOOLS_PATH, or if we can finally get rid of that and replace it with $WORKSPACE/BaseTools globally. / Leif > --- > {ArmPkg/Library => BaseTools/Bin}/GccLto/liblto-aarch64.a | Bin > {ArmPkg/Library => BaseTools/Bin}/GccLto/liblto-aarch64.s | 0 > {ArmPkg/Library => BaseTools/Bin}/GccLto/liblto-arm.a | Bin > {ArmPkg/Library => BaseTools/Bin}/GccLto/liblto-arm.s | 0 > BaseTools/Conf/tools_def.template | 19 ++++++++++--------- > 5 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/ArmPkg/Library/GccLto/liblto-aarch64.a b/BaseTools/Bin/GccLto/liblto-aarch64.a > similarity index 100% > rename from ArmPkg/Library/GccLto/liblto-aarch64.a > rename to BaseTools/Bin/GccLto/liblto-aarch64.a > diff --git a/ArmPkg/Library/GccLto/liblto-aarch64.s b/BaseTools/Bin/GccLto/liblto-aarch64.s > similarity index 100% > rename from ArmPkg/Library/GccLto/liblto-aarch64.s > rename to BaseTools/Bin/GccLto/liblto-aarch64.s > diff --git a/ArmPkg/Library/GccLto/liblto-arm.a b/BaseTools/Bin/GccLto/liblto-arm.a > similarity index 100% > rename from ArmPkg/Library/GccLto/liblto-arm.a > rename to BaseTools/Bin/GccLto/liblto-arm.a > diff --git a/ArmPkg/Library/GccLto/liblto-arm.s b/BaseTools/Bin/GccLto/liblto-arm.s > similarity index 100% > rename from ArmPkg/Library/GccLto/liblto-arm.s > rename to BaseTools/Bin/GccLto/liblto-arm.s > diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template > index 2e6b382ab623..cd8899d24d4a 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -15,7 +15,8 @@ > # 2.00 - Initial version with changes for CI > # - Change RC path to use plugin > # > -#!VERSION=2.00 > +# 2.10 - Move GccLto files to a tools path to be more repository layout agnostic > +#!VERSION=2.10 > > IDENTIFIER = Default TOOL_CHAIN_CONF > > @@ -2386,10 +2387,10 @@ RELEASE_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os > *_GCC5_ARM_CC_XIPFLAGS = DEF(GCC5_ARM_CC_XIPFLAGS) > > DEBUG_GCC5_ARM_CC_FLAGS = DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unused-but-set-variable -Wno-unused-const-variable > - DEBUG_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > + DEBUG_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > > RELEASE_GCC5_ARM_CC_FLAGS = DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unused-but-set-variable -Wno-unused-const-variable > -RELEASE_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > +RELEASE_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > > NOOPT_GCC5_ARM_CC_FLAGS = DEF(GCC5_ARM_CC_FLAGS) -O0 > NOOPT_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -O0 > @@ -2420,11 +2421,11 @@ RELEASE_GCC5_ARM_DLINK_FLAGS = DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -L$(WORKS > *_GCC5_AARCH64_CC_XIPFLAGS = DEF(GCC5_AARCH64_CC_XIPFLAGS) > > DEBUG_GCC5_AARCH64_CC_FLAGS = DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno-unused-but-set-variable -Wno-unused-const-variable > - DEBUG_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 -Wno-lto-type-mismatch > + DEBUG_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 -Wno-lto-type-mismatch > DEBUG_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 > > RELEASE_GCC5_AARCH64_CC_FLAGS = DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno-unused-but-set-variable -Wno-unused-const-variable > -RELEASE_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 -Wno-lto-type-mismatch > +RELEASE_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 -Wno-lto-type-mismatch > RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 > > NOOPT_GCC5_AARCH64_CC_FLAGS = DEF(GCC5_AARCH64_CC_FLAGS) -O0 > @@ -2681,11 +2682,11 @@ DEFINE CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_TARGET) DEF(GCC_ARM_DLINK_FLA > *_CLANG38_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) > > DEBUG_CLANG38_ARM_CC_FLAGS = DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O1 > - DEBUG_CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_DLINK_FLAGS) -flto -Wl,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > + DEBUG_CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_DLINK_FLAGS) -flto -Wl,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > NOOPT_CLANG38_ARM_CC_FLAGS = DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -O0 > NOOPT_CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_DLINK_FLAGS) > RELEASE_CLANG38_ARM_CC_FLAGS = DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3 > -RELEASE_CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_DLINK_FLAGS) -flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > +RELEASE_CLANG38_ARM_DLINK_FLAGS = DEF(CLANG38_ARM_DLINK_FLAGS) -flto -Wl,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=-pass-through=-llto-arm > > ################## > # CLANG38 AARCH64 definitions > @@ -2727,11 +2728,11 @@ DEFINE CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_TARGET) DEF(GCC_AARCH6 > *_CLANG38_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) > > DEBUG_CLANG38_AARCH64_CC_FLAGS = DEF(CLANG38_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O1 > - DEBUG_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 > + DEBUG_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 > NOOPT_CLANG38_AARCH64_CC_FLAGS = DEF(CLANG38_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -O0 > NOOPT_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) > RELEASE_CLANG38_AARCH64_CC_FLAGS = DEF(CLANG38_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3 > -RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 > +RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=-pass-through=-llto-aarch64 > > #################################################################################### > # > -- > 2.31.1.windows.1 >