Marvin, It is ready to be checked in. I can take care of that tomorrow.
Mike From: Marvin Häuser [mailto:marvin.haeu...@outlook.com] Sent: Thursday, February 11, 2016 11:20 AM To: edk2-devel@lists.01.org Cc: Kinney, Michael D <michael.d.kin...@intel.com> Subject: RE: [edk2] [PATCH] MdePkg: Update Base.h to fix compilation issues with ICC. Dear Mike, Am I supposed to perform any changes to this patch or is it considered ready for merge? > To: michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>; > marvin.haeu...@outlook.com<mailto:marvin.haeu...@outlook.com>; > edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>; > michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com> > From: jordan.l.jus...@intel.com<mailto:jordan.l.jus...@intel.com> > Subject: RE: [edk2] [PATCH] MdePkg: Update Base.h to fix compilation issues > with ICC. > Date: Sat, 30 Jan 2016 20:23:53 -0800 > > On 2016-01-30 19:44:26, Kinney, Michael D wrote: > > Jordan, > > > > Good idea, but ECB compiler does not define __INTEL_COMPILER. > > > > Ok. You can add my r-b for the patch: > > Reviewed-by: Jordan Justen > <jordan.l.jus...@intel.com<mailto:jordan.l.jus...@intel.com>> > > > > > > -----Original Message----- > > > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > > > Jordan Justen > > > Sent: Saturday, January 30, 2016 5:53 PM > > > To: Kinney, Michael D > > > <michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>>; Marvin > > > Haeuser > > > <marvin.haeu...@outlook.com<mailto:marvin.haeu...@outlook.com>>; > > > edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>; Kinney, Michael D > > > <michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>> > > > Subject: Re: [edk2] [PATCH] MdePkg: Update Base.h to fix compilation > > > issues with ICC. > > > > > > On 2016-01-30 16:42:55, Kinney, Michael D wrote: > > > > Reviewed-by: Michael Kinney > > > > <michael.d.kin...@intel.com<mailto: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<mailto: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<mailto: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<mailto:edk2-devel@lists.01.org> > > > > > https://lists.01.org/mailman/listinfo/edk2-devel > > > > _______________________________________________ > > > > edk2-devel mailing list > > > > edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org> > > > > https://lists.01.org/mailman/listinfo/edk2-devel > > > _______________________________________________ > > > edk2-devel mailing list > > > edk2-devel@lists.01.org<mailto: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
