From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.861.1635884328990591970 for ; Tue, 02 Nov 2021 13:18:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=Ma9Bit+V; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.214.179, mailfrom: bret@corthon.com) Received: by mail-pl1-f179.google.com with SMTP id u11so642315plf.3 for ; Tue, 02 Nov 2021 13:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corthon-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BYg9ofUHJ+zy9rrTIP8a4oMVcQEVoHNL+0FKbzChQHs=; b=Ma9Bit+VBIa/Mjz04Yk1ZDH7lP3Yat7q2ActsYtQQWFx6e8rKj4QbBBeeLMNQjDafB twHk1IoyItijjcfu/z1m8WDttKGHaAwl4x7tuEGAwHja/n+IfdKa6NFe2bdDyl+o9TOy foMzGXJGi3FJiRlu7/uQShcEa4w+wHtjFJa4bE7lbRXXmQjBqxvY1655jsf5/weFIg8i 3KoX9QRfWP68QqsffZv5w36uhkzM8/ijq8nAapsjSsJXFYoqGgae8P7MEuZF2brJeDqU 2L7dHpHVMeVdhYU0vdH66LMOW0P4EdN8rR78ZlypPXdKtoNlka52VRxgIKwF+Lq6hd3o IaXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BYg9ofUHJ+zy9rrTIP8a4oMVcQEVoHNL+0FKbzChQHs=; b=AyMmswKZYDAojVNOgik9QS3zpRzvvJDWzxYRSPX1S3VPKimT54u5mfJG4jYqDzNVb4 lSxXxLIS9htHQ/Dc2h/0SDppctVzLe2HynVOS1YaZanQn/gaKNrj98zHuez5o/BMj8V8 AvgeoeURwBv0ZjWfLJA3GFl3eoeJOgHpOHFB+zP4VKDe2T5n9LqlBPBEK6ZVgL1YLNGn UA4J3KNNG2qg84BArqFdLIX86JfKnuyD5036+2zLlrWTSxcfSZLK0lCPPNcBEDtCCb+3 xpK4oEOTAj7vo0agrBCbpP0CGgnPxrIyf3E2zFJhTjK+r1zv5hjPR3kbh5Rh7X1SrRAQ +Mzg== X-Gm-Message-State: AOAM533N3rG3iApRjXG7BSd2TFFkxGedA15k/5m56RFRnFNrQx7xJDeb D2DAed1XoCC/Jh18PoKgIWVWi79fpXiGFpdr X-Google-Smtp-Source: ABdhPJwpyLK46jsEtxUPpj0myxgN6zR04gdGRh+AsIdYgaDtHDZmqcDup6dtFT0ZWPtkAo/ujPyn3Q== X-Received: by 2002:a17:90b:1c8e:: with SMTP id oo14mr9548727pjb.224.1635884328330; Tue, 02 Nov 2021 13:18:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:47 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan Subject: [PATCH v2 06/16] ArmPkg and BaseTools: Move the GccLto binaries from ArmPkg to BaseTools Date: Tue, 2 Nov 2021 13:17:38 -0700 Message-Id: <20211102201748.1963-7-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-1-brbarkel@microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=3D3650 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-aarch64.a | Bin {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-aarch64.s | 0 {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-arm.a | Bin {ArmPkg/Library =3D> 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/libl= to-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/libl= to-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.t= emplate 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=0D # - Change RC path to use plugin=0D #=0D -#!VERSION=3D2.00=0D +# 2.10 - Move GccLto files to a tools path to be more repository layout ag= nostic=0D +#!VERSION=3D2.10=0D =0D IDENTIFIER =3D Default TOOL_CHAIN_CONF=0D =0D @@ -2386,10 +2387,10 @@ RELEASE_GCC5_X64_DLINK_FLAGS =3D DEF(GCC5_X64_D= LINK_FLAGS) -flto -Os *_GCC5_ARM_CC_XIPFLAGS =3D DEF(GCC5_ARM_CC_XIPFLAGS)=0D =0D DEBUG_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unu= sed-but-set-variable -Wno-unused-const-variable=0D - DEBUG_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throu= gh=3D-llto-arm=0D + DEBUG_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throug= h=3D-llto-arm=0D =0D RELEASE_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unu= sed-but-set-variable -Wno-unused-const-variable=0D -RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throu= gh=3D-llto-arm=0D +RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throug= h=3D-llto-arm=0D =0D NOOPT_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -O0=0D NOOPT_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -O0=0D @@ -2420,11 +2421,11 @@ RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_D= LINK_FLAGS) -flto -Os -L$(WORKS *_GCC5_AARCH64_CC_XIPFLAGS =3D DEF(GCC5_AARCH64_CC_XIPFLAGS)=0D =0D DEBUG_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno= -unused-but-set-variable -Wno-unused-const-variable=0D - DEBUG_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pa= ss-through=3D-llto-aarch64 -Wno-lto-type-mismatch=0D + DEBUG_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pas= s-through=3D-llto-aarch64 -Wno-lto-type-mismatch=0D DEBUG_GCC5_AARCH64_DLINK_XIPFLAGS =3D -z common-page-size=3D0x20=0D =0D RELEASE_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno= -unused-but-set-variable -Wno-unused-const-variable=0D -RELEASE_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pa= ss-through=3D-llto-aarch64 -Wno-lto-type-mismatch=0D +RELEASE_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pas= s-through=3D-llto-aarch64 -Wno-lto-type-mismatch=0D RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS =3D -z common-page-size=3D0x20=0D =0D NOOPT_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -O0=0D @@ -2681,11 +2682,11 @@ DEFINE CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_AR= M_TARGET) DEF(GCC_ARM_DLINK_FLA *_CLANG38_ARM_CC_XIPFLAGS =3D DEF(GCC_ARM_CC_XIPFLAGS)=0D =0D DEBUG_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -flto -O1=0D - DEBUG_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pas= s-through=3D-llto-arm=0D + DEBUG_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass= -through=3D-llto-arm=0D NOOPT_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -O0=0D NOOPT_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS)=0D RELEASE_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -flto -O3=0D -RELEASE_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pas= s-through=3D-llto-arm=0D +RELEASE_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass= -through=3D-llto-arm=0D =0D ##################=0D # CLANG38 AARCH64 definitions=0D @@ -2727,11 +2728,11 @@ DEFINE CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38= _AARCH64_TARGET) DEF(GCC_AARCH6 *_CLANG38_AARCH64_CC_XIPFLAGS =3D DEF(GCC_AARCH64_CC_XIPFLAGS)=0D =0D DEBUG_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O1=0D - DEBUG_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64=0D + DEBUG_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-= opt=3D-pass-through=3D-llto-aarch64=0D NOOPT_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -O0=0D NOOPT_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS)=0D RELEASE_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3=0D -RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64=0D +RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-= opt=3D-pass-through=3D-llto-aarch64=0D =0D ##########################################################################= ##########=0D #=0D --=20 2.31.1.windows.1