Index: llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h
===================================================================
--- llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h
+++ llvm/trunk/include/llvm/MC/MCLinkerOptimizationHint.h
@@ -61,6 +61,7 @@
     MCLOHCaseNameToId(AdrpAdd)
     MCLOHCaseNameToId(AdrpLdrGot)
     .Default(-1);
+#undef MCLOHCaseNameToId
 }
 
 static inline StringRef MCLOHIdToName(MCLOHType Kind) {
@@ -76,6 +77,7 @@
     MCLOHCaseIdToName(AdrpLdrGot);
   }
   return StringRef();
+#undef MCLOHCaseIdToName
 }
 
 static inline int MCLOHIdToNbArgs(MCLOHType Kind) {