diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-26 22:13:57 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-26 22:13:57 +0000 |
| commit | 496cf2308acf4bb719a015517f27dff10db7de49 (patch) | |
| tree | 7a34bdf0b66b61c00721fd3b1ffa56d9cc82bfc5 /lib | |
| parent | 107c578126c477ad330bb79defb10ef14eb7dad3 (diff) | |
| download | external_llvm-496cf2308acf4bb719a015517f27dff10db7de49.zip external_llvm-496cf2308acf4bb719a015517f27dff10db7de49.tar.gz external_llvm-496cf2308acf4bb719a015517f27dff10db7de49.tar.bz2 | |
Revert "[PowerPC] Improve consistency in use of __ppc__, __powerpc__, etc."
This reverts commit r187248. It broke many bots.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187254 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Support/Unix/Memory.inc | 4 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCJITInfo.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Support/Unix/Memory.inc b/lib/Support/Unix/Memory.inc index 73f586f..58fda42 100644 --- a/lib/Support/Unix/Memory.inc +++ b/lib/Support/Unix/Memory.inc @@ -310,14 +310,14 @@ void Memory::InvalidateInstructionCache(const void *Addr, // icache invalidation for PPC and ARM. #if defined(__APPLE__) -# if (defined(__POWERPC__) || defined (__ppc__) || defined (__powerpc__) \ +# if (defined(__POWERPC__) || defined (__ppc__) || \ defined(_POWER) || defined(_ARCH_PPC)) || defined(__arm__) sys_icache_invalidate(const_cast<void *>(Addr), Len); # endif #else -# if (defined(__POWERPC__) || defined (__ppc__) || defined (__powerpc__) || \ +# if (defined(__POWERPC__) || defined (__ppc__) || \ defined(_POWER) || defined(_ARCH_PPC)) && defined(__GNUC__) const size_t LineSize = 32; diff --git a/lib/Target/PowerPC/PPCJITInfo.cpp b/lib/Target/PowerPC/PPCJITInfo.cpp index 71c8f1d..18f4adf 100644 --- a/lib/Target/PowerPC/PPCJITInfo.cpp +++ b/lib/Target/PowerPC/PPCJITInfo.cpp @@ -71,7 +71,7 @@ static void EmitBranchToAt(uint64_t At, uint64_t To, bool isCall, bool is64Bit){ extern "C" void PPC32CompilationCallback(); extern "C" void PPC64CompilationCallback(); -#if defined(__powerpc64__) || defined(__ppc64__) +#if (!defined(__ppc__) && !defined(__powerpc__)) || defined(__powerpc64__) || defined(__ppc64__) void PPC32CompilationCallback() { llvm_unreachable("This is not a 32bit PowerPC, you can't execute this!"); } @@ -356,8 +356,8 @@ TargetJITInfo::StubLayout PPCJITInfo::getStubLayout() { return Result; } -#if (defined(__POWERPC__) || defined (__ppc__) || defined(__powerpc__) || \ -defined(_POWER)) && defined(__APPLE__) +#if (defined(__POWERPC__) || defined (__ppc__) || defined(_POWER)) && \ +defined(__APPLE__) extern "C" void sys_icache_invalidate(const void *Addr, size_t len); #endif |