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)