From 0e6cb8a8d90c98ecd39da253b3d219eb76489729 Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Wed, 24 Dec 2014 00:16:51 +0000 Subject: [PATCH] Another attempt to fix the LLVM Windows build bot lld-x86_64-win7, one last place to fix I think. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224794 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/MachO.h | 34 ++++++++++++++++---------------- tools/llvm-objdump/MachODump.cpp | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/llvm/Support/MachO.h b/include/llvm/Support/MachO.h index feb993e1ab5..77512750592 100644 --- a/include/llvm/Support/MachO.h +++ b/include/llvm/Support/MachO.h @@ -1494,7 +1494,7 @@ namespace llvm { char mmst_rsrv[6]; }; - struct xmm_reg { + struct xmm_reg_t { char xmm_reg[16]; }; @@ -1521,22 +1521,22 @@ namespace llvm { 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; - xmm_reg fpu_xmm3; - xmm_reg fpu_xmm4; - xmm_reg fpu_xmm5; - xmm_reg fpu_xmm6; - xmm_reg fpu_xmm7; - xmm_reg fpu_xmm8; - xmm_reg fpu_xmm9; - xmm_reg fpu_xmm10; - xmm_reg fpu_xmm11; - xmm_reg fpu_xmm12; - xmm_reg fpu_xmm13; - xmm_reg fpu_xmm14; - xmm_reg fpu_xmm15; + xmm_reg_t fpu_xmm0; + xmm_reg_t fpu_xmm1; + xmm_reg_t fpu_xmm2; + xmm_reg_t fpu_xmm3; + xmm_reg_t fpu_xmm4; + xmm_reg_t fpu_xmm5; + xmm_reg_t fpu_xmm6; + xmm_reg_t fpu_xmm7; + xmm_reg_t fpu_xmm8; + xmm_reg_t fpu_xmm9; + xmm_reg_t fpu_xmm10; + xmm_reg_t fpu_xmm11; + xmm_reg_t fpu_xmm12; + xmm_reg_t fpu_xmm13; + xmm_reg_t fpu_xmm14; + xmm_reg_t fpu_xmm15; char fpu_rsrv4[6*16]; uint32_t fpu_reserved1; }; diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 3f828128897..36db9ad5366 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -3809,7 +3809,7 @@ static void Print_mmst_reg(MachO::mmst_reg_t &r) { outs() << "\n"; } -static void Print_xmm_reg(MachO::xmm_reg &r) { +static void Print_xmm_reg(MachO::xmm_reg_t &r) { uint32_t f; outs() << "\t xmm_reg "; for (f = 0; f < 16; f++) -- 2.40.0