From: Yaxun (Sam) Liu <yaxun.liu@amd.com>
Date: Thu, 11 Jun 2020 03:41:51 +0000 (-0400)
Subject: Fix __clang_cuda_math_forward_declares.h
X-Git-Tag: llvmorg-12-init~3412
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af00eb25f890ecbf02818f1466da8f30d93e6298;p=platform%2Fupstream%2Fllvm.git

Fix __clang_cuda_math_forward_declares.h

Recent change from `#if !defined(__CUDA__)` to `#if !__CUDA__` caused
regression on ROCm 3.5 since there is `#define __CUDA__`
before inclusion of the header file, which causes `#if !__CUDA__`
to be invalid.

Change `#if !__CUDA__` back to `#if !defined(__CUDA__)` for backward
compatibility.
---

diff --git a/clang/lib/Headers/__clang_cuda_math_forward_declares.h b/clang/lib/Headers/__clang_cuda_math_forward_declares.h
index 7c0b357..8a27085 100644
--- a/clang/lib/Headers/__clang_cuda_math_forward_declares.h
+++ b/clang/lib/Headers/__clang_cuda_math_forward_declares.h
@@ -8,7 +8,7 @@
  */
 #ifndef __CLANG__CUDA_MATH_FORWARD_DECLARES_H__
 #define __CLANG__CUDA_MATH_FORWARD_DECLARES_H__
-#if !__CUDA__ && !__HIP__
+#if !defined(__CUDA__) && !__HIP__
 #error "This file is for CUDA/HIP compilation only."
 #endif