summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2014-12-23 23:43:59 +0000
committerKevin Enderby <enderby@apple.com>2014-12-23 23:43:59 +0000
commit227df348ccf30e01bf8e5bfd597951d86dadb25c (patch)
tree29ab0507bccf71b0beaa3d7e73cb58bc33448746
parent48ef534b7423df934248de5c1400700501b687a8 (diff)
downloadbcm5719-llvm-227df348ccf30e01bf8e5bfd597951d86dadb25c.tar.gz
bcm5719-llvm-227df348ccf30e01bf8e5bfd597951d86dadb25c.zip
Attempt to fix the LLVM Windows build bot lld-x86_64-win7.
llvm-svn: 224793
-rw-r--r--llvm/include/llvm/Support/MachO.h18
-rw-r--r--llvm/tools/llvm-objdump/MachODump.cpp2
2 files changed, 10 insertions, 10 deletions
diff --git a/llvm/include/llvm/Support/MachO.h b/llvm/include/llvm/Support/MachO.h
index d8117fab287..feb993e1ab5 100644
--- a/llvm/include/llvm/Support/MachO.h
+++ b/llvm/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/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 1bca452c934..3f828128897 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/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++)
OpenPOWER on IntegriCloud