maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use the LLVM Macho.h header instead of relying on the system one, 

patch by Arvid Picciani!

llvm-svn: 115563
This commit is contained in:
Chris Lattner 2010-10-04 21:24:01 +00:00
parent cbc7bc94c9
commit 69d23282b4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
View File

@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "ArchDefaultUnwindPlan-x86.h" #include "ArchDefaultUnwindPlan-x86.h"
#include "llvm/Support/MachO.h"
#include "lldb/lldb-private.h" #include "lldb/lldb-private.h"
#include "lldb/Utility/ArchDefaultUnwindPlan.h" #include "lldb/Utility/ArchDefaultUnwindPlan.h"
#include "lldb/Core/ArchSpec.h" #include "lldb/Core/ArchSpec.h"
@ -21,11 +21,11 @@ using namespace lldb_private;
lldb_private::UnwindPlan* lldb_private::UnwindPlan*
ArchDefaultUnwindPlan_x86::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc) ArchDefaultUnwindPlan_x86::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
{ {
if (m_cpu == CPU_TYPE_X86_64) if (m_cpu == llvm::MachO::CPUTypeX86_64)
{ {
return &m_64bit_default; return &m_64bit_default;
} }
if (m_cpu == CPU_TYPE_I386) if (m_cpu == llvm::MachO::CPUTypeI386)
{ {
return &m_32bit_default; return &m_32bit_default;
} }
@ -36,7 +36,7 @@ lldb_private::ArchDefaultUnwindPlan *
ArchDefaultUnwindPlan_x86::CreateInstance (const lldb_private::ArchSpec &arch) ArchDefaultUnwindPlan_x86::CreateInstance (const lldb_private::ArchSpec &arch)
{ {
uint32_t cpu = arch.GetCPUType (); uint32_t cpu = arch.GetCPUType ();
if (cpu != CPU_TYPE_X86_64 && cpu != CPU_TYPE_I386) if (cpu != llvm::MachO::CPUTypeX86_64 && cpu != llvm::MachO::CPUTypeI386)
return NULL; return NULL;
return new ArchDefaultUnwindPlan_x86 (cpu); return new ArchDefaultUnwindPlan_x86 (cpu);

6
lldb/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
View File

@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "ArchVolatileRegs-x86.h" #include "ArchVolatileRegs-x86.h"
#include "llvm/Support/MachO.h"
#include "lldb/lldb-private.h" #include "lldb/lldb-private.h"
#include "lldb/Utility/ArchVolatileRegs.h" #include "lldb/Utility/ArchVolatileRegs.h"
#include "lldb/Core/ArchSpec.h" #include "lldb/Core/ArchSpec.h"
@ -35,7 +35,7 @@ lldb_private::ArchVolatileRegs *
ArchVolatileRegs_x86::CreateInstance (const lldb_private::ArchSpec &arch) ArchVolatileRegs_x86::CreateInstance (const lldb_private::ArchSpec &arch)
{ {
uint32_t cpu = arch.GetCPUType (); uint32_t cpu = arch.GetCPUType ();
if (cpu != CPU_TYPE_X86_64 && cpu != CPU_TYPE_I386) if (cpu != llvm::MachO::CPUTypeX86_64 && cpu != llvm::MachO::CPUTypeI386)
return NULL; return NULL;
return new ArchVolatileRegs_x86 (cpu); return new ArchVolatileRegs_x86 (cpu);
@ -78,7 +78,7 @@ ArchVolatileRegs_x86::initialize_regset(Thread& thread)
const char **names; const char **names;
int namecount; int namecount;
if (m_cpu == CPU_TYPE_X86_64) if (m_cpu == llvm::MachO::CPUTypeX86_64)
{ {
names = x86_64_regnames; names = x86_64_regnames;
namecount = sizeof (x86_64_regnames) / sizeof (char *); namecount = sizeof (x86_64_regnames) / sizeof (char *);