From 496cf2308acf4bb719a015517f27dff10db7de49 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 26 Jul 2013 22:13:57 +0000 Subject: [PATCH] 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 --- lib/Support/Unix/Memory.inc | 4 ++-- lib/Target/PowerPC/PPCJITInfo.cpp | 6 +++--- unittests/ADT/BitVectorTest.cpp | 2 +- unittests/ADT/PackedVectorTest.cpp | 2 +- unittests/ExecutionEngine/JIT/MultiJITTest.cpp | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/Support/Unix/Memory.inc b/lib/Support/Unix/Memory.inc index 73f586ff4a8..58fda420eb6 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(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 71c8f1db1c7..18f4adf839e 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 diff --git a/unittests/ADT/BitVectorTest.cpp b/unittests/ADT/BitVectorTest.cpp index 4d3223e418d..d7cde891fb5 100644 --- a/unittests/ADT/BitVectorTest.cpp +++ b/unittests/ADT/BitVectorTest.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // Some of these tests fail on PowerPC for unknown reasons. -#if !defined(__ppc__) && !defined(__powerpc__) +#ifndef __ppc__ #include "llvm/ADT/BitVector.h" #include "llvm/ADT/SmallBitVector.h" diff --git a/unittests/ADT/PackedVectorTest.cpp b/unittests/ADT/PackedVectorTest.cpp index b6a7e583012..55b5d8d049d 100644 --- a/unittests/ADT/PackedVectorTest.cpp +++ b/unittests/ADT/PackedVectorTest.cpp @@ -9,7 +9,7 @@ // BitVectorTest tests fail on PowerPC for unknown reasons, so disable this // as well since it depends on a BitVector. -#if !defined(__ppc__) && !defined(__powerpc__) +#ifndef __ppc__ #include "llvm/ADT/PackedVector.h" #include "gtest/gtest.h" diff --git a/unittests/ExecutionEngine/JIT/MultiJITTest.cpp b/unittests/ExecutionEngine/JIT/MultiJITTest.cpp index 29689b71a24..4018cd5ce2f 100644 --- a/unittests/ExecutionEngine/JIT/MultiJITTest.cpp +++ b/unittests/ExecutionEngine/JIT/MultiJITTest.cpp @@ -21,8 +21,7 @@ using namespace llvm; namespace { // ARM, PowerPC and SystemZ tests disabled pending fix for PR10783. -#if !defined(__arm__) && !defined(__powerpc__) && !defined(__s390__) && \ - !defined(__ppc__) +#if !defined(__arm__) && !defined(__powerpc__) && !defined(__s390__) bool LoadAssemblyInto(Module *M, const char *assembly) { SMDiagnostic Error; -- 2.34.1