[edk2-devel] [PATCH v5 00/10] BaseTools: remove duplicate includes.

Gerd Hoffmann posted 10 patches 1 year ago
Failed in applying to current master (apply log)
There is a newer version of this series
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/Scripts/ClangBase.lds               |  10 +
BaseTools/Scripts/GccBase.lds                 |  10 +
BaseTools/Source/C/Makefiles/header.makefile  |  15 +-
BaseTools/Source/C/Makefiles/ms.common        |  13 +-
33 files changed, 132 insertions(+), 4093 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
[edk2-devel] [PATCH v5 00/10] BaseTools: remove duplicate includes.
Posted by Gerd Hoffmann 1 year ago
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.

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 (10):
  BaseTools: make sure the got is empty
  MdePkg: don't set visibility to hidden
  BaseTools: remove WinNtInclude.h
  BaseTools: remove duplicate includes: <arch>/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/Scripts/ClangBase.lds               |  10 +
 BaseTools/Scripts/GccBase.lds                 |  10 +
 BaseTools/Source/C/Makefiles/header.makefile  |  15 +-
 BaseTools/Source/C/Makefiles/ms.common        |  13 +-
 33 files changed, 132 insertions(+), 4093 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.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103344): https://edk2.groups.io/g/devel/message/103344
Mute This Topic: https://groups.io/mt/98404597/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v5 00/10] BaseTools: remove duplicate includes.
Posted by Gerd Hoffmann 1 year ago
Ping.

On Fri, Apr 21, 2023 at 06:45:25AM +0200, 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.
> 
> 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 (10):
>   BaseTools: make sure the got is empty
>   MdePkg: don't set visibility to hidden
>   BaseTools: remove WinNtInclude.h
>   BaseTools: remove duplicate includes: <arch>/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/Scripts/ClangBase.lds               |  10 +
>  BaseTools/Scripts/GccBase.lds                 |  10 +
>  BaseTools/Source/C/Makefiles/header.makefile  |  15 +-
>  BaseTools/Source/C/Makefiles/ms.common        |  13 +-
>  33 files changed, 132 insertions(+), 4093 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.0
> 

-- 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103984): https://edk2.groups.io/g/devel/message/103984
Mute This Topic: https://groups.io/mt/98404597/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v5 00/10] BaseTools: remove duplicate includes.
Posted by Rebecca Cran 1 year ago
Sorry for the delay.


For the series:

Reviewed-by: Rebecca Cran <rebecca@bsdio.com>


On 5/4/23 04:11, Gerd Hoffmann wrote:
> Ping.
>
> On Fri, Apr 21, 2023 at 06:45:25AM +0200, 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.
>>
>> 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 (10):
>>    BaseTools: make sure the got is empty
>>    MdePkg: don't set visibility to hidden
>>    BaseTools: remove WinNtInclude.h
>>    BaseTools: remove duplicate includes: <arch>/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/Scripts/ClangBase.lds               |  10 +
>>   BaseTools/Scripts/GccBase.lds                 |  10 +
>>   BaseTools/Source/C/Makefiles/header.makefile  |  15 +-
>>   BaseTools/Source/C/Makefiles/ms.common        |  13 +-
>>   33 files changed, 132 insertions(+), 4093 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.0
>>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103988): https://edk2.groups.io/g/devel/message/103988
Mute This Topic: https://groups.io/mt/98404597/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] 回复: [PATCH v5 00/10] BaseTools: remove duplicate includes.
Posted by gaoliming via groups.io 1 year ago
Gerd:
  I have no other comments for this patch set. This change is great to reduce the duplication definitions.

  Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

  Besides, GCC49 tool chain doesn't define USING_LTO macro. If GCC49 is verified, it will be better.

Thanks
Liming
> -----邮件原件-----
> 发件人: Gerd Hoffmann <kraxel@redhat.com>
> 发送时间: 2023年5月4日 18:11
> 收件人: devel@edk2.groups.io
> 抄送: Yuwei Chen <yuwei.chen@intel.com>; Oliver Steffen
> <osteffen@redhat.com>; Bob Feng <bob.c.feng@intel.com>; Marvin Häuser
> <mhaeuser@posteo.de>; Daniel Schaefer <git@danielschaefer.me>; Chao Li
> <lichao@loongson.cn>; Dongyan Qian <qiandongyan@loongson.cn>; Michael
> D Kinney <michael.d.kinney@intel.com>; Pawel Polawski
> <ppolawsk@redhat.com>; Baoqi Zhang <zhangbaoqi@loongson.cn>; Leif
> Lindholm <quic_llindhol@quicinc.com>; Rebecca Cran <rebecca@bsdio.com>;
> Zhiguang Liu <zhiguang.liu@intel.com>; Sunil V L
> <sunilvl@ventanamicro.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> Liming Gao <gaoliming@byosoft.com.cn>
> 主题: Re: [PATCH v5 00/10] BaseTools: remove duplicate includes.
> 
> Ping.
> 
> On Fri, Apr 21, 2023 at 06:45:25AM +0200, 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.
> >
> > 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 (10):
> >   BaseTools: make sure the got is empty
> >   MdePkg: don't set visibility to hidden
> >   BaseTools: remove WinNtInclude.h
> >   BaseTools: remove duplicate includes: <arch>/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/Scripts/ClangBase.lds               |  10 +
> >  BaseTools/Scripts/GccBase.lds                 |  10 +
> >  BaseTools/Source/C/Makefiles/header.makefile  |  15 +-
> >  BaseTools/Source/C/Makefiles/ms.common        |  13 +-
> >  33 files changed, 132 insertions(+), 4093 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/MemoryMappedConfiguration
> SpaceAccessTable.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.0
> >
> 
> --





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103987): https://edk2.groups.io/g/devel/message/103987
Mute This Topic: https://groups.io/mt/98682652/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-