[PATCH] D67864: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header
Martin Storsjö via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat Sep 21 12:08:45 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL372481: [CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header (authored by mstorsjo, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D67864?vs=221115&id=221191#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D67864/new/
https://reviews.llvm.org/D67864
Files:
llvm/trunk/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
Index: llvm/trunk/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
===================================================================
--- llvm/trunk/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
+++ llvm/trunk/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.221191.patch
Type: text/x-patch
Size: 719 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190921/49edd856/attachment.bin>
More information about the llvm-commits
mailing list