Ard,
Can you also update XCODE:*_*_X64_CC_FLAGS to -DSIXTY_FOUR_BIT_LONG in this
patch as it is LP64 too.
XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
$(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT
to:
XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
$(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
Reviewed-by: Andrew Fish <[email protected]>
Thanks,
Andrew Fish
On Sep 18, 2014, at 10:45 AM, Ard Biesheuvel <[email protected]> wrote:
> Users of the LP64 data model should declare SIXTY_FOUR_BIT_LONG,
> not SIXTY_FOUR_BIT when building OpenSSL.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <[email protected]>
> ---
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index d380158a4339..20991529b1c4 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -655,10 +655,10 @@
> INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT
> INTEL:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER
> -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT
> GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64
> $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
> - GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64
> $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT
> - GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64
> $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT
> + GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64
> $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
> + GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64
> $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
> GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS)
> $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
> - GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)
> $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT
> + GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)
> $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG
>
> # suppress the following warnings in openssl so we don't break the build
> with warnings-as-errors:
> # 1295: Deprecated declaration <entity> - give arg types
> --
> 1.8.3.2
>
------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
