From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C74EF21B02843 for ; Thu, 7 Dec 2017 03:28:47 -0800 (PST) Received: by mail-wr0-x242.google.com with SMTP id k61so7108385wrc.4 for ; Thu, 07 Dec 2017 03:33:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=4+bmq5l3GlDEbgGBN3bz+4SFuBYl/n+jUxNDr9VyEzI=; b=H9gT1OHDCu79LQY+y1/Pu/AoZj5IhSAVRCNYEHuQ7Xwita6L1bG7dMV/sg56DgQ0Ri g+apJhvAHsRreluXSc8KZdviJjyie7Z2F7G+WeTI8BMqW1E8koLGNoiT1wKHFJSFqfpE MXA4o7UJ7ImAG0eRa6XmV+2DLrxW2Of18jrVM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=4+bmq5l3GlDEbgGBN3bz+4SFuBYl/n+jUxNDr9VyEzI=; b=RHQfco1+cRfdUeCan5cv/I3Mm66X6vfnuIaWa3UPTQR2jd6IOCOmDEuHQplk4jFFCW xYbcV3tvdDy0NxBrEFkJP03zgxDROOGB7fJLKHrpkfV4lRTagh3i39UOh3zvXQI/T15Y DwRrBWJU0VMt8UmSXuRsj+0gKFAy22bjhyljyy3tQcfsH9YThrhHGDO4Mp0DsSm6kat6 RZj8DLLc37qfScTCTE76MxD8+SZdWUhwkoLaIPdDuof2A9yhqmGWTeSJQdvYbt9W2uyt 1ZBS//6blhrn82shJMevZf47YVTc1dcSSlCDcXg/Jy91HmXXd42adlzc4/vYyZ19E8dX bBmQ== X-Gm-Message-State: AJaThX7LdWpGLNM9aN4lyxT8ui+gGVZj1M2VZNPL1U8xJZyv7Pc3CrTi GZi2/9TDat2n5Yaz4PzJRf83haySxdk= X-Google-Smtp-Source: AGs4zMYC7snRIPWsutVp8aDoudp26KSOGl9ZbnbDP3tWVculIPLY4due3vwLH4c4tiB/ySQSXNjl8g== X-Received: by 10.223.139.73 with SMTP id v9mr22970384wra.77.1512646399496; Thu, 07 Dec 2017 03:33:19 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 56sm6382074wrx.73.2017.12.07.03.33.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Dec 2017 03:33:18 -0800 (PST) Date: Thu, 7 Dec 2017 11:33:16 +0000 From: Leif Lindholm To: "Gao, Liming" Cc: "edk2-devel@lists.01.org" , "Kinney, Michael D" , "ard.biesheuvel@linaro.org" Message-ID: <20171207113316.gg26v4megwv33bdw@bivouac.eciton.net> References: <20171206170745.8705-1-leif.lindholm@linaro.org> <4A89E2EF3DFEDB4C8BFDE51014F606A14E18BA7A@SHSMSX104.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E18BA7A@SHSMSX104.ccr.corp.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH] MdePkg: Arm/AArch64 - filter #pragma pack() when __ASSEMBLER__ X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 11:28:48 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Dec 07, 2017 at 03:09:17AM +0000, Gao, Liming wrote: > Reviewed-by: Liming Gao Thanks! Pushed as 5b8766bb92. > >-----Original Message----- > >From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > >Sent: Thursday, December 07, 2017 1:08 AM > >To: edk2-devel@lists.01.org > >Cc: Kinney, Michael D ; Gao, Liming > >; ard.biesheuvel@linaro.org > >Subject: [PATCH] MdePkg: Arm/AArch64 - filter #pragma pack() when > >__ASSEMBLER__ > > > >clang, when used as a preprocessor for dtc, does not discard #pragma > >statements although -x assembler-with-cpp is specified. This causes dtc > >to barf at a #pragma pack() statement that is already filtered out for > >__GNUC__. So add a check to also filter this out if __ASSEMBLER__. > > > >Contributed-under: TianoCore Contribution Agreement 1.1 > >Signed-off-by: Leif Lindholm > >--- > > MdePkg/Include/AArch64/ProcessorBind.h | 2 +- > > MdePkg/Include/Arm/ProcessorBind.h | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > >diff --git a/MdePkg/Include/AArch64/ProcessorBind.h > >b/MdePkg/Include/AArch64/ProcessorBind.h > >index 775e7498c5..7b0f0ff32f 100644 > >--- a/MdePkg/Include/AArch64/ProcessorBind.h > >+++ b/MdePkg/Include/AArch64/ProcessorBind.h > >@@ -26,7 +26,7 @@ > > // > > // Make sure we are using the correct packing rules per EFI specification > > // > >-#ifndef __GNUC__ > >+#if !defined(__GNUC__) && !defined(__ASSEMBLER__) > > #pragma pack() > > #endif > > > >diff --git a/MdePkg/Include/Arm/ProcessorBind.h > >b/MdePkg/Include/Arm/ProcessorBind.h > >index dde1fd1152..42ea2f3055 100644 > >--- a/MdePkg/Include/Arm/ProcessorBind.h > >+++ b/MdePkg/Include/Arm/ProcessorBind.h > >@@ -24,7 +24,7 @@ > > // > > // Make sure we are using the correct packing rules per EFI specification > > // > >-#ifndef __GNUC__ > >+#if !defined(__GNUC__) && !defined(__ASSEMBLER__) > > #pragma pack() > > #endif > > > >-- > >2.11.0 >