On 2016-01-30 16:42:55, Kinney, Michael D wrote: > Reviewed-by: Michael Kinney <michael.d.kin...@intel.com> >
Mike, do you think the EBC compiler also defines __INTEL_COMPILER? If so, then this might work: #if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) -Jordan > > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > > Marvin Haeuser > > Sent: Friday, January 29, 2016 3:56 PM > > To: edk2-devel@lists.01.org > > Subject: [edk2] [PATCH] 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.haeu...@outlook.com> > > --- > > 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 85ed34f..2baf9a7 100644 > > --- a/MdePkg/Include/Base.h > > +++ b/MdePkg/Include/Base.h > > @@ -1022,7 +1022,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.6.2.windows.1 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
