summaryrefslogtreecommitdiffstats
path: root/MdePkg
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2017-12-06 16:57:55 +0000
committerLeif Lindholm <leif.lindholm@linaro.org>2017-12-07 11:31:50 +0000
commit5b8766bb92debfa7b2f45a4a6d683b4227360d66 (patch)
tree7e3c09a1b912712c71686c5df6ef1a446497ee78 /MdePkg
parentd1632f694be027dee87dd18fa8172d674221face (diff)
downloadedk2-5b8766bb92debfa7b2f45a4a6d683b4227360d66.tar.gz
edk2-5b8766bb92debfa7b2f45a4a6d683b4227360d66.tar.bz2
edk2-5b8766bb92debfa7b2f45a4a6d683b4227360d66.zip
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 <leif.lindholm@linaro.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'MdePkg')
-rw-r--r--MdePkg/Include/AArch64/ProcessorBind.h2
-rw-r--r--MdePkg/Include/Arm/ProcessorBind.h2
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