From: Kevin Enderby <enderby@apple.com>
Date: Tue, 23 Dec 2014 23:43:59 +0000 (+0000)
Subject: Attempt to fix the LLVM Windows build bot lld-x86_64-win7.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4bc0635654b1773961d3bc99e5fcd67a1b4caa3f;p=oota-llvm.git

Attempt to fix the LLVM Windows build bot lld-x86_64-win7.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224793 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/MachO.h b/include/llvm/Support/MachO.h
index d8117fab287..feb993e1ab5 100644
--- a/include/llvm/Support/MachO.h
+++ b/include/llvm/Support/MachO.h
@@ -1489,7 +1489,7 @@ namespace llvm {
         busy    :1;
     };
 
-    struct mmst_reg {
+    struct mmst_reg_t {
       char mmst_reg[10];
       char mmst_rsrv[6];
     };
@@ -1513,14 +1513,14 @@ namespace llvm {
       uint16_t fpu_rsrv3;
       uint32_t fpu_mxcsr;
       uint32_t fpu_mxcsrmask;
-      mmst_reg fpu_stmm0;
-      mmst_reg fpu_stmm1;
-      mmst_reg fpu_stmm2;
-      mmst_reg fpu_stmm3;
-      mmst_reg fpu_stmm4;
-      mmst_reg fpu_stmm5;
-      mmst_reg fpu_stmm6;
-      mmst_reg fpu_stmm7;
+      mmst_reg_t fpu_stmm0;
+      mmst_reg_t fpu_stmm1;
+      mmst_reg_t fpu_stmm2;
+      mmst_reg_t fpu_stmm3;
+      mmst_reg_t fpu_stmm4;
+      mmst_reg_t fpu_stmm5;
+      mmst_reg_t fpu_stmm6;
+      mmst_reg_t fpu_stmm7;
       xmm_reg fpu_xmm0;
       xmm_reg fpu_xmm1;
       xmm_reg fpu_xmm2;
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 1bca452c934..3f828128897 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -3797,7 +3797,7 @@ static void Print_x86_thread_state64_t(MachO::x86_thread_state64_t &cpu64) {
   outs() << "    gs  " << format("0x%016" PRIx64, cpu64.gs) << "\n";
 }
 
-static void Print_mmst_reg(MachO::mmst_reg &r) {
+static void Print_mmst_reg(MachO::mmst_reg_t &r) {
   uint32_t f;
   outs() << "\t      mmst_reg  ";
   for (f = 0; f < 10; f++)