Revert the tests that should've been reverted in rL341115

llvm-svn: 341118
llvm · Aug 30, 2018 · fe5b1ac · fe5b1ac
1 parent f4f767d
commit fe5b1ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 69 deletions.
diff --git a/clang/test/Preprocessor/aux-triple.c b/clang/test/Preprocessor/aux-triple.c
diff --git 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
@@ -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() {