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

3 files changed, 3 insertions, 4 deletions

diff --git a/unittests/ADT/BitVectorTest.cpp b/unittests/ADT/BitVectorTest.cpp
index 4d3223e..d7cde89 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 b6a7e58..55b5d8d 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 29689b7..4018cd5 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;