[PATCH] D67864: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 221115.
mstorsjo added a comment.

Added a comment.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67864/new/

https://reviews.llvm.org/D67864

Files:
  llvm/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def


Index: llvm/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
===================================================================
--- llvm/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
+++ llvm/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
@@ -489,6 +489,11 @@
 
 #if defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64)
 
+// arm64intr.h from MSVC defines ARM64_FPSR, which conflicts with
+// these declarations.
+#pragma push_macro("ARM64_FPSR")
+#undef ARM64_FPSR
+
 // ARM64 registers
 
 CV_REGISTER(ARM64_NOREG, 0)
@@ -677,4 +682,6 @@
 
 CV_REGISTER(ARM64_FPSR, 220)
 
+#pragma pop_macro("ARM64_FPSR")
+
 #endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67864.221115.patch
Type: text/x-patch
Size: 701 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190920/ed63f5b6/attachment.bin>