From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.11884.1681390319093839470 for ; Thu, 13 Apr 2023 05:51:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=di5LFI7N; spf=pass (domain: bsdio.com, ip: 66.111.4.27, mailfrom: rebecca@bsdio.com) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 5D2865C0062; Thu, 13 Apr 2023 08:51:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 13 Apr 2023 08:51:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1681390318; x=1681476718; bh=0VXrYQKALRp7KjylF5OcJQWr0ydybxV4VAh FOWfw8io=; b=di5LFI7NpL9FigAYS0x6l62a3oUrR6hPAOJcQDI724pvVTeykMi 4Bn9pffnhtv8K3pYpet1/a15xlZh8oJ5zdIczAToHodrfh31fErgQZdPgGgqrbBs icfBs3/TpnXCYgNs7ilEvdWtxJw2bS5dhsisX17FuQiHTUGPsjZBVO5iUDmjEeAc 32d8lwLnfX6KX8+7RnFYIJQrsQIi7tpc2EsjbK+ly2TRyPp/Z5YFEd8GzGTlZBOZ v4XCUTpKe/GeMfLAN+sCrtOg91CeDtjkvWAqnIr0hVenSQqRD0XDUCpBUXaSVpWD zsKoe3Vwv7zw7rtjAOdeggCrlTybQXJqq2g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1681390318; x=1681476718; bh=0VXrYQKALRp7KjylF5OcJQWr0ydybxV4VAh FOWfw8io=; b=JqaQWp4uEiT05AxlomVeNr/M2kKAfF4ibs4ddOp0WkNvR4UQUpw 5U8Xs7oh/+pX3Z+8Y5HE0hGmihwYeTY0qz60ZS2njRXb0zZ8QP8mOSURbzB6ZLiV gBG8wER2AHECsxxo3imhLDbhyCnHUw88gdzg3NDAtjiEhQOmroGwcAcx4baymKFV vtTNUfWWQ32h/GM6dQ3h8L1DMTT4l0ppoSid8vlBgLKHy1qu85LgUumMouFb8+9G uU1VhEq+x34C28yaiAkq6ihTeYJPa/nI+VwezZoNavdutwISrl1g5kGjuFcUO64Z bV/mC8ykuGoelzKlGbSq9SkkDuFDXsghwSA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdekkedgheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtkeertddtfeejnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegfeegveduheejgfduffefhfehleehiefghfetvdejvdelhfeukefhhfdv geehveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Apr 2023 08:51:55 -0400 (EDT) Message-ID: <25f50418-d3b7-ad92-5d41-688063c2e8b0@bsdio.com> Date: Thu, 13 Apr 2023 06:51:55 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH v3 00/10] BaseTools: remove duplicate includes. To: Gerd Hoffmann , devel@edk2.groups.io Cc: Sunil V L , Zhiguang Liu , Chao Li , Michael D Kinney , Pawel Polawski , Baoqi Zhang , Leif Lindholm , Dongyan Qian , Oliver Steffen , Bob Feng , Liming Gao , Ard Biesheuvel , =?UTF-8?Q?Marvin_H=c3=a4user?= , Daniel Schaefer , Yuwei Chen References: <20230413085313.273483-1-kraxel@redhat.com> From: "Rebecca Cran" In-Reply-To: <20230413085313.273483-1-kraxel@redhat.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Building with clang 14 on Ubuntu 22.04 fails. "make CC=clang CXX=clang++ -C BaseTools" causes the following errors: ... clang++ -o ../bin/VfrCompile  AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyntax.o VfrFormPkg.o VfrError.o VfrUtilityLib.o VfrCompiler.o -L../libs -lCommon /usr/bin/ld: VfrSyntax.o: in function `EfiVfrParser::vfrExtensionData(unsigned char*, unsigned int, char*, unsigned int, unsigned char, unsigned int)': VfrSyntax.cpp:(.text+0x10210): undefined reference to `strlen' /usr/bin/ld: VfrSyntax.cpp:(.text+0x1023b): undefined reference to `strcpy' /usr/bin/ld: VfrSyntax.cpp:(.text+0x1024b): undefined reference to `strlen' /usr/bin/ld: VfrSyntax.cpp:(.text+0x1037d): undefined reference to `strlen' /usr/bin/ld: VfrSyntax.cpp:(.text+0x103a8): undefined reference to `strcpy' ... /usr/bin/ld: ParseInf.c:(.text+0x44d): undefined reference to `strlen' /usr/bin/ld: ../libs/libCommon.a(ParseInf.o): in function `AsciiStringToUint64': ParseInf.c:(.text+0x651): undefined reference to `strlen' /usr/bin/ld: ../bin/VfrCompile: hidden symbol `strlen' isn't defined /usr/bin/ld: final link failed: bad value clang: error: linker command failed with exit code 1 (use -v to see invocation) make[2]: *** [GNUmakefile:45: ../bin/VfrCompile] Error 1 make[2]: Leaving directory '/home/bcran/src/uefi/edk2/BaseTools/Source/C/VfrCompile' make[1]: *** [GNUmakefile:79: VfrCompile] Error 2 make[1]: Leaving directory '/home/bcran/src/uefi/edk2/BaseTools/Source/C' make: *** [GNUmakefile:19: Source/C] Error 2 make: Leaving directory '/home/bcran/src/uefi/edk2/BaseTools' -- Rebecca Cran On 4/13/23 02:53, Gerd Hoffmann wrote: > There is alot of code duplication between BaseTools and MdePkg (and also > MdeModulePkg). This patch series starts reducing this by removing some > header files. BaseTools are switched over to use the include files in > MdePkg instead. It also cleans up some (apparently) obsolete code and > adapts BaseTools code in a few places to work with the MdePkg version of > the include files. > > v3 changes: > - fix build failure on ubuntu 22.04 > v2 changes: > - rebase to latest master, resolve conflicts. > - pick up reviews and acks. > > take care, > Gerd > > Gerd Hoffmann (10): > BaseTools: add BASETOOLS define > MdePkg: don't set visibility to hidden for BaseTools > BaseTools: remove WinNtInclude.h > BaseTools: remove duplicate includes: /ProcessorBind.h > BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h > MdePkg/PeImage.h: add bits from BaseTools version > BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks > BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* > BaseTools: remove duplicate includes: IndustryStandard/PeImage.h > BaseTools: remove duplicate includes: IndustryStandard/*.h > > BaseTools/Source/C/Common/WinNtInclude.h | 66 -- > BaseTools/Source/C/EfiRom/EfiRom.h | 14 +- > .../Source/C/Include/AArch64/ProcessorBind.h | 148 ---- > .../Source/C/Include/Arm/ProcessorBind.h | 147 ---- > .../Source/C/Include/Ia32/ProcessorBind.h | 155 ---- > .../Source/C/Include/IndustryStandard/Acpi.h | 117 --- > .../C/Include/IndustryStandard/Acpi1_0.h | 285 ------- > .../C/Include/IndustryStandard/Acpi2_0.h | 520 ------------ > .../C/Include/IndustryStandard/Acpi3_0.h | 668 --------------- > .../C/Include/IndustryStandard/Bluetooth.h | 56 -- > .../C/Include/IndustryStandard/EfiPci.h | 51 -- > ...emoryMappedConfigurationSpaceAccessTable.h | 39 - > .../C/Include/IndustryStandard/PeImage.h | 789 ------------------ > .../Source/C/Include/IndustryStandard/pci22.h | 536 ------------ > .../Source/C/Include/IndustryStandard/pci23.h | 18 - > .../Source/C/Include/IndustryStandard/pci30.h | 38 - > .../C/Include/LoongArch64/ProcessorBind.h | 80 -- > .../Source/C/Include/Protocol/DevicePath.h | 2 +- > .../Source/C/Include/RiscV64/ProcessorBind.h | 85 -- > .../Source/C/Include/X64/ProcessorBind.h | 183 ---- > MdePkg/Include/IndustryStandard/PeImage.h | 31 + > MdePkg/Include/X64/ProcessorBind.h | 2 +- > BaseTools/Source/C/Common/BasePeCoff.c | 51 +- > BaseTools/Source/C/Common/Decompress.c | 1 + > BaseTools/Source/C/GenFv/GenFvInternalLib.c | 43 +- > BaseTools/Source/C/GenFw/Elf32Convert.c | 8 +- > BaseTools/Source/C/GenFw/Elf64Convert.c | 12 +- > BaseTools/Source/C/GenFw/ElfConvert.c | 2 - > BaseTools/Source/C/GenFw/GenFw.c | 18 +- > BaseTools/Source/C/Makefiles/header.makefile | 18 +- > BaseTools/Source/C/Makefiles/ms.common | 17 +- > 31 files changed, 118 insertions(+), 4082 deletions(-) > delete mode 100644 BaseTools/Source/C/Common/WinNtInclude.h > delete mode 100644 BaseTools/Source/C/Include/AArch64/ProcessorBind.h > delete mode 100644 BaseTools/Source/C/Include/Arm/ProcessorBind.h > delete mode 100644 BaseTools/Source/C/Include/Ia32/ProcessorBind.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi1_0.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi2_0.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Acpi3_0.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/Bluetooth.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/EfiPci.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/PeImage.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci22.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci23.h > delete mode 100644 BaseTools/Source/C/Include/IndustryStandard/pci30.h > delete mode 100644 BaseTools/Source/C/Include/LoongArch64/ProcessorBind.h > delete mode 100644 BaseTools/Source/C/Include/RiscV64/ProcessorBind.h > delete mode 100644 BaseTools/Source/C/Include/X64/ProcessorBind.h >