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
This commit is contained in:
Rafael Espindola 2013-07-26 22:13:57 +00:00
parent 107c578126
commit 496cf2308a
5 changed files with 8 additions and 9 deletions

View File

@ -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;

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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;