Merging r195432:

------------------------------------------------------------------------
r195432 | haoliu | 2013-11-22 01:24:41 -0800 (Fri, 22 Nov 2013) | 3 lines

Fix a Cygwin build failure caused by enum values starting with '_', which is conflicted with some platform macros.    
This patch only renames variables, no functional change.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195601 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 36 insertions, 36 deletions

diff --git a/lib/Target/AArch64/Utils/AArch64BaseInfo.h b/lib/Target/AArch64/Utils/AArch64BaseInfo.h
index d6ae147..ce970b0 100644
--- a/lib/Target/AArch64/Utils/AArch64BaseInfo.h
+++ b/lib/Target/AArch64/Utils/AArch64BaseInfo.h
@@ -309,40 +309,40 @@ namespace A64SE {
 namespace A64Layout {
     enum VectorLayout {
         Invalid = -1,
-        _8B,
-        _4H,
-        _2S,
-        _1D,
+        VL_8B,
+        VL_4H,
+        VL_2S,
+        VL_1D,
 
-        _16B,
-        _8H,
-        _4S,
-        _2D,
+        VL_16B,
+        VL_8H,
+        VL_4S,
+        VL_2D,
 
         // Bare layout for the 128-bit vector
         // (only show ".b", ".h", ".s", ".d" without vector number)
-        _B,
-        _H,
-        _S,
-        _D
+        VL_B,
+        VL_H,
+        VL_S,
+        VL_D
     };
 }
 
 inline static const char *
 A64VectorLayoutToString(A64Layout::VectorLayout Layout) {
   switch (Layout) {
-  case A64Layout::_8B:  return ".8b";
-  case A64Layout::_4H:  return ".4h";
-  case A64Layout::_2S:  return ".2s";
-  case A64Layout::_1D:  return ".1d";
-  case A64Layout::_16B:  return ".16b";
-  case A64Layout::_8H:  return ".8h";
-  case A64Layout::_4S:  return ".4s";
-  case A64Layout::_2D:  return ".2d";
-  case A64Layout::_B:  return ".b";
-  case A64Layout::_H:  return ".h";
-  case A64Layout::_S:  return ".s";
-  case A64Layout::_D:  return ".d";
+  case A64Layout::VL_8B:  return ".8b";
+  case A64Layout::VL_4H:  return ".4h";
+  case A64Layout::VL_2S:  return ".2s";
+  case A64Layout::VL_1D:  return ".1d";
+  case A64Layout::VL_16B:  return ".16b";
+  case A64Layout::VL_8H:  return ".8h";
+  case A64Layout::VL_4S:  return ".4s";
+  case A64Layout::VL_2D:  return ".2d";
+  case A64Layout::VL_B:  return ".b";
+  case A64Layout::VL_H:  return ".h";
+  case A64Layout::VL_S:  return ".s";
+  case A64Layout::VL_D:  return ".d";
   default: llvm_unreachable("Unknown Vector Layout");
   }
 }
@@ -350,18 +350,18 @@ A64VectorLayoutToString(A64Layout::VectorLayout Layout) {
 inline static A64Layout::VectorLayout
 A64StringToVectorLayout(StringRef LayoutStr) {
   return StringSwitch<A64Layout::VectorLayout>(LayoutStr)
-             .Case(".8b", A64Layout::_8B)
-             .Case(".4h", A64Layout::_4H)
-             .Case(".2s", A64Layout::_2S)
-             .Case(".1d", A64Layout::_1D)
-             .Case(".16b", A64Layout::_16B)
-             .Case(".8h", A64Layout::_8H)
-             .Case(".4s", A64Layout::_4S)
-             .Case(".2d", A64Layout::_2D)
-             .Case(".b", A64Layout::_B)
-             .Case(".h", A64Layout::_H)
-             .Case(".s", A64Layout::_S)
-             .Case(".d", A64Layout::_D)
+             .Case(".8b", A64Layout::VL_8B)
+             .Case(".4h", A64Layout::VL_4H)
+             .Case(".2s", A64Layout::VL_2S)
+             .Case(".1d", A64Layout::VL_1D)
+             .Case(".16b", A64Layout::VL_16B)
+             .Case(".8h", A64Layout::VL_8H)
+             .Case(".4s", A64Layout::VL_4S)
+             .Case(".2d", A64Layout::VL_2D)
+             .Case(".b", A64Layout::VL_B)
+             .Case(".h", A64Layout::VL_H)
+             .Case(".s", A64Layout::VL_S)
+             .Case(".d", A64Layout::VL_D)
              .Default(A64Layout::Invalid);
 }