From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.9761.1684937172337729771 for ; Wed, 24 May 2023 07:06:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AvGZYJWS; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684937171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0QXKmTAhIGoJtdeFQs38FChPBtD5Wvbrz8+mCwa85fU=; b=AvGZYJWSI2v2fg71hnIhZEmOE+PEJIqtIBsDY/UQAmsOtSewWNsBUmksOy+naOI3k4ej1n zsrLbwh8x5vH+ttPiJE+E+hFkpVNKwA+WqJfq9dX/HFTvejBuQBKnwI0If3/FFVIW7fs7Z +V5ZoZi878l/4yD3ByJwmyC6YZo5u68= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-bYsJy8DsPOC3pYh59qoqZQ-1; Wed, 24 May 2023 10:06:07 -0400 X-MC-Unique: bYsJy8DsPOC3pYh59qoqZQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0BA7018193E8; Wed, 24 May 2023 14:06:03 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 041DF400F17; Wed, 24 May 2023 14:06:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 94EB818007AC; Wed, 24 May 2023 16:06:00 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Daniel Schaefer , =?UTF-8?q?Marvin=20H=C3=A4user?= , Rebecca Cran , Oliver Steffen , Liming Gao , Pawel Polawski , Chao Li , Ard Biesheuvel , Bob Feng , Sunil V L , Michael D Kinney , Leif Lindholm , Dongyan Qian , Yuwei Chen , Baoqi Zhang , Zhiguang Liu , Gerd Hoffmann Subject: [PATCH v6 00/11] BaseTools: remove duplicate includes. Date: Wed, 24 May 2023 16:05:49 +0200 Message-Id: <20230524140600.1432056-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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. v6 changes: - rebase to latest master. - pick up reviews and acks. - add clang fix (patch #2). v5 changes: - remove visibility hidden on x64 - add assert for GOT being empty. v4 changes: - fix clang build failure 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 (11): BaseTools: make sure the got is empty BaseTools: add -fdirect-access-external-data to clang pie builds MdePkg: don't set visibility to hidden 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 | 14 - 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/Conf/tools_def.template | 6 +- BaseTools/Scripts/ClangBase.lds | 10 + BaseTools/Scripts/GccBase.lds | 10 + BaseTools/Source/C/Makefiles/header.makefile | 15 +- BaseTools/Source/C/Makefiles/ms.common | 13 +- 34 files changed, 135 insertions(+), 4096 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 -- 2.40.1