Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13525
-gerrit
commit df53a07478f286973c588accdd5d247c65067031 Author: Stefan Reinauer stefan.reinauer@coreboot.org Date: Sat Jan 30 02:02:21 2016 -0800
vendorcode/intel: remove unused apple specific assembler macros
Since this code is pulled in through commonlib, it will break compilation of cbfstool on OSX.
Change-Id: I342bfa7e755aa540c4563bb5cd8cccacee39d188 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h | 10 ---------- src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h | 1 - 2 files changed, 11 deletions(-)
diff --git a/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h b/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h index e403ebd..b7dc94d 100644 --- a/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h +++ b/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include/Base.h @@ -94,16 +94,6 @@ VERIFY_SIZE_OF (CHAR16, 2); /// #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name)
-#if __APPLE__ - // - // Apple extension that is used by the linker to optimize code size - // with assembly functions. Put at the end of your .S files - // - #define ASM_FUNCTION_REMOVE_IF_UNREFERENCED .subsections_via_symbols -#else - #define ASM_FUNCTION_REMOVE_IF_UNREFERENCED -#endif - #ifdef __CC_ARM // // Older RVCT ARM compilers don't fully support #pragma pack and require __packed diff --git a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h index e68f8c9..910730b 100644 --- a/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h +++ b/src/vendorcode/intel/edk2/uefi_2.4/uefi_types.h @@ -34,7 +34,6 @@ are permitted provided that the following conditions are met: // // Set the UEFI types and attributes // -#define __APPLE__ 0 #include <stdlib.h> #include <Uefi/UefiBaseType.h> #include <Pi/PiBootMode.h>