Revert the tests that should've been reverted in rL341115

llvm-svn: 341118

3 files changed, 3 insertions, 69 deletions

diff --git a/clang/test/Preprocessor/aux-triple.c b/clang/test/Preprocessor/aux-triple.c
deleted file mode 100644
index a753d23b771..00000000000
--- a/clang/test/Preprocessor/aux-triple.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// Ensure that Clang sets some very basic target defines based on -aux-triple.
-
-// RUN: %clang_cc1 -E -dM -ffreestanding < /dev/null \
-// RUN:     -triple nvptx64-none-none \
-// RUN:   | FileCheck -match-full-lines -check-prefixes NVPTX64,NONE %s
-// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding < /dev/null \
-// RUN:     -triple nvptx64-none-none \
-// RUN:   | FileCheck -match-full-lines -check-prefixes NVPTX64,NONE %s
-// RUN: %clang_cc1 -x cuda -E -dM -ffreestanding < /dev/null \
-// RUN:     -triple nvptx64-none-none \
-// RUN:   | FileCheck -match-full-lines -check-prefixes NVPTX64,NONE %s
-
-// CUDA:
-// RUN: %clang_cc1 -x cuda -E -dM -ffreestanding < /dev/null \
-// RUN:     -triple nvptx64-none-none -aux-triple powerpc64le-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines %s \
-// RUN:     -check-prefixes NVPTX64,PPC64LE,LINUX,LINUX-CPP
-// RUN: %clang_cc1 -x cuda -E -dM -ffreestanding < /dev/null \
-// RUN:     -triple nvptx64-none-none -aux-triple x86_64-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines %s \
-// RUN:     -check-prefixes NVPTX64,X86_64,LINUX,LINUX-CPP
-
-// OpenMP:
-// RUN: %clang_cc1 -E -dM -ffreestanding < /dev/null \
-// RUN:     -fopenmp -fopenmp-is-device -triple nvptx64-none-none \
-// RUN:     -aux-triple powerpc64le-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines -check-prefixes NVPTX64,PPC64LE,LINUX %s
-// RUN: %clang_cc1 -E -dM -ffreestanding < /dev/null \
-// RUN:     -fopenmp -fopenmp-is-device -triple nvptx64-none-none \
-// RUN:     -aux-triple x86_64-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines -check-prefixes NVPTX64,X86_64,LINUX %s
-// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding < /dev/null \
-// RUN:     -fopenmp -fopenmp-is-device -triple nvptx64-none-none \
-// RUN:     -aux-triple powerpc64le-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines %s \
-// RUN:     -check-prefixes NVPTX64,PPC64LE,LINUX,LINUX-CPP
-// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding < /dev/null \
-// RUN:     -fopenmp -fopenmp-is-device -triple nvptx64-none-none \
-// RUN:     -aux-triple x86_64-unknown-linux-gnu \
-// RUN:   | FileCheck -match-full-lines %s \
-// RUN:     -check-prefixes NVPTX64,X86_64,LINUX,LINUX-CPP
-
-// PPC64LE:#define _CALL_ELF 2
-
-// NONE-NOT:#define _GNU_SOURCE
-// LINUX-CPP:#define _GNU_SOURCE 1
-
-// NVPTX64:#define _LP64 1
-
-// NONE-NOT:#define __ELF__
-// LINUX:#define __ELF__ 1
-
-// NVPTX64:#define __LP64__ 1
-// NVPTX64:#define __NVPTX__ 1
-// NVPTX64:#define __PTX__ 1
-
-// NONE-NOT:#define __linux__
-// LINUX:#define __linux__ 1
-
-// NONE-NOT:#define __powerpc64__
-// PPC64LE:#define __powerpc64__ 1
-
-// NONE-NOT:#define __x86_64__
-// X86_64:#define __x86_64__ 1
diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c
index 71c3166689e..9296b1cf5a5 100644
--- a/clang/test/Preprocessor/predefined-macros.c
+++ b/clang/test/Preprocessor/predefined-macros.c
@@ -183,11 +183,9 @@
 // CHECK-HIP: #define __HIP__ 1
 
 // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \
-// RUN:   -aux-triple x86_64-unknown-linux -fcuda-is-device \
+// RUN:   -fcuda-is-device \
 // RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP-DEV
 // CHECK-HIP-DEV-NOT: #define __CUDA_ARCH__
 // CHECK-HIP-DEV: #define __HIPCC__ 1
 // CHECK-HIP-DEV: #define __HIP_DEVICE_COMPILE__ 1
 // CHECK-HIP-DEV: #define __HIP__ 1
-// CHECK_HIP-DEV: #define __linux__ 1
-// CHECK_HIP-DEV: #define __gnu_linux__ 1
diff --git a/clang/test/SemaCUDA/builtins.cu b/clang/test/SemaCUDA/builtins.cu
index 41418b5a278..814fda2ac7d 100644
--- a/clang/test/SemaCUDA/builtins.cu
+++ b/clang/test/SemaCUDA/builtins.cu
@@ -12,8 +12,8 @@
 // RUN:     -aux-triple x86_64-unknown-unknown \
 // RUN:     -fsyntax-only -verify %s
 
-#if !defined(__x86_64__)
-#error "Expected to see preprocessor macros from the host."
+#if !(defined(__amd64__) && defined(__PTX__))
+#error "Expected to see preprocessor macros from both sides of compilation."
 #endif
 
 void hf() {