diff options
| author | edk2-devel <edk2-devel-bounces@lists.01.org> | 2016-01-29 15:55:57 -0800 |
|---|---|---|
| committer | Michael Kinney <michael.d.kinney@intel.com> | 2016-02-12 10:06:54 -0800 |
| commit | 62ec4a5ef674846f3edd0317e59b0c509873b3b5 (patch) | |
| tree | 6cc37371cd01d1fbddda104cbf9a0b3f2903b752 | |
| parent | 1f40f5352642b8d6802cc8dc39c31a8610869e93 (diff) | |
| download | edk2-platforms-62ec4a5ef674846f3edd0317e59b0c509873b3b5.tar.xz | |
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 <Marvin.Haeuser@outlook.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
| -rw-r--r-- | MdePkg/Include/Base.h | 2 |
1 files changed, 1 insertions, 1 deletions
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.
|