Merge pull request #101 from compnerd/r372481

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

Author: shahmishal

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

@@ -368,6 +368,11 @@ CV_REGISTER(AMD64_K7, 765)
 
 #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)
@@ -556,4 +561,6 @@ CV_REGISTER(ARM64_Q31, 211)
 
 CV_REGISTER(ARM64_FPSR, 220)
 
+#pragma pop_macro("ARM64_FPSR")
+
 #endif // defined(CV_REGISTERS_ALL) || defined(CV_REGISTERS_ARM64)