From 62ec4a5ef674846f3edd0317e59b0c509873b3b5 Mon Sep 17 00:00:00 2001 From: edk2-devel Date: Fri, 29 Jan 2016 15:55:57 -0800 Subject: [PATCH 1/1] MdePkg: Update Base.h to fix compilation issues with ICC. Recent versions of the Intel C compiler define the _MSC_EXTENSIONS constant. Base.h checks if this constant is defined to decide whether or not to use a pragma intrinsic, which is unsupported by the latest version of the Intel C compiler. Thus the check has been modified to only pass in the case __INTEL_COMPILER is not defined. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Marvin Haeuser Reviewed-by: Michael Kinney Reviewed-by: Jordan Justen --- MdePkg/Include/Base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 882b5a6793..f45f3442cb 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -1027,7 +1027,7 @@ typedef UINTN RETURN_STATUS; #define SIGNATURE_64(A, B, C, D, E, F, G, H) \ (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32)) -#if defined(_MSC_EXTENSIONS) && !defined (MDE_CPU_EBC) +#if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC) #pragma intrinsic(_ReturnAddress) /** Get the return address of the calling funcation. -- 2.39.2