diff options
| -rw-r--r-- | lib/Target/ARM/ARMAsmBackend.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCAsmBackend.cpp | 8 | ||||
| -rw-r--r-- | lib/Target/X86/X86AsmBackend.cpp | 13 |
3 files changed, 15 insertions, 13 deletions
diff --git a/lib/Target/ARM/ARMAsmBackend.cpp b/lib/Target/ARM/ARMAsmBackend.cpp index a314207..e7ff8bd 100644 --- a/lib/Target/ARM/ARMAsmBackend.cpp +++ b/lib/Target/ARM/ARMAsmBackend.cpp @@ -17,8 +17,8 @@ #include "llvm/MC/MCObjectWriter.h" #include "llvm/MC/MCSectionELF.h" #include "llvm/MC/MCSectionMachO.h" +#include "llvm/Object/MachOFormat.h" #include "llvm/Support/ELF.h" -#include "llvm/Support/MachO.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetRegistry.h" @@ -115,8 +115,9 @@ public: MCObjectWriter *createObjectWriter(raw_ostream &OS) const { // FIXME: Subtarget info should be derived. Force v7 for now. - return createMachObjectWriter(OS, /*Is64Bit=*/false, MachO::CPUTypeARM, - MachO::CPUSubType_ARM_V7, + return createMachObjectWriter(OS, /*Is64Bit=*/false, + object::mach::CTM_ARM, + object::mach::CSARM_V7, /*IsLittleEndian=*/true); } diff --git a/lib/Target/PowerPC/PPCAsmBackend.cpp b/lib/Target/PowerPC/PPCAsmBackend.cpp index 8790a69..de0ee4e 100644 --- a/lib/Target/PowerPC/PPCAsmBackend.cpp +++ b/lib/Target/PowerPC/PPCAsmBackend.cpp @@ -13,8 +13,8 @@ #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCObjectFormat.h" #include "llvm/MC/MCObjectWriter.h" +#include "llvm/Object/MachOFormat.h" #include "llvm/Target/TargetRegistry.h" -#include "llvm/Support/MachO.h" using namespace llvm; namespace { @@ -72,9 +72,9 @@ namespace { MCObjectWriter *createObjectWriter(raw_ostream &OS) const { bool is64 = getPointerSize() == 8; return createMachObjectWriter(OS, /*Is64Bit=*/is64, - is64 ? MachO::CPUTypePowerPC64 : - MachO::CPUTypePowerPC64, - MachO::CPUSubType_POWERPC_ALL, + (is64 ? object::mach::CTM_PowerPC64 : + object::mach::CTM_PowerPC), + object::mach::CSPPC_ALL, /*IsLittleEndian=*/false); } diff --git a/lib/Target/X86/X86AsmBackend.cpp b/lib/Target/X86/X86AsmBackend.cpp index 031de9d..f27cd03 100644 --- a/lib/Target/X86/X86AsmBackend.cpp +++ b/lib/Target/X86/X86AsmBackend.cpp @@ -18,15 +18,14 @@ #include "llvm/MC/MCSectionCOFF.h" #include "llvm/MC/MCSectionELF.h" #include "llvm/MC/MCSectionMachO.h" +#include "llvm/Object/MachOFormat.h" #include "llvm/Support/ELF.h" -#include "llvm/Support/MachO.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/Target/TargetAsmBackend.h" using namespace llvm; - static unsigned getFixupKindLog2Size(unsigned Kind) { switch (Kind) { default: assert(0 && "invalid fixup kind!"); @@ -360,8 +359,9 @@ public: } MCObjectWriter *createObjectWriter(raw_ostream &OS) const { - return createMachObjectWriter(OS, /*Is64Bit=*/false, MachO::CPUTypeI386, - MachO::CPUSubType_I386_ALL, + return createMachObjectWriter(OS, /*Is64Bit=*/false, + object::mach::CTM_i386, + object::mach::CSX86_ALL, /*IsLittleEndian=*/true); } }; @@ -378,8 +378,9 @@ public: } MCObjectWriter *createObjectWriter(raw_ostream &OS) const { - return createMachObjectWriter(OS, /*Is64Bit=*/true, MachO::CPUTypeX86_64, - MachO::CPUSubType_I386_ALL, + return createMachObjectWriter(OS, /*Is64Bit=*/true, + object::mach::CTM_x86_64, + object::mach::CSX86_ALL, /*IsLittleEndian=*/true); } |