[llvm] r224793 - Attempt to fix the LLVM Windows build bot lld-x86_64-win7.

[Kevin Enderby]

Author: enderby
Date: Tue Dec 23 17:43:59 2014
New Revision: 224793

URL: http://llvm.org/viewvc/llvm-project?rev=224793&view=rev
Log:
Attempt to fix the LLVM Windows build bot lld-x86_64-win7.

Modified:
    llvm/trunk/include/llvm/Support/MachO.h
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Modified: llvm/trunk/include/llvm/Support/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MachO.h?rev=224793&r1=224792&r2=224793&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/MachO.h (original)
+++ llvm/trunk/include/llvm/Support/MachO.h Tue Dec 23 17:43:59 2014
@@ -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;

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=224793&r1=224792&r2=224793&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Tue Dec 23 17:43:59 2014
@@ -3797,7 +3797,7 @@ static void Print_x86_thread_state64_t(M
   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++)