aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2012-05-20 23:28:32 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2012-05-20 23:28:32 +0000
commita77b75950ab14552748f1653b7449486c38e0a36 (patch)
tree948a4b5ffc3f7aea1bc5feb803e5cffc1e006d6e
parentef0d6d4b799fd9533e681da803f0cf9bee8cf0fa (diff)
CUDA: the device and host attributes must be inheritable, in order
to deal with NVIDIA's headers. We'll need to think of another way to handle multiple host/device definitions within the same TU. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157171 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Basic/Attr.td4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 7d05b72a74..f4370113fd 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -267,7 +267,7 @@ def CUDAConstant : InheritableAttr {
let Spellings = ["constant"];
}
-def CUDADevice : Attr {
+def CUDADevice : InheritableAttr {
let Spellings = ["device"];
}
@@ -275,7 +275,7 @@ def CUDAGlobal : InheritableAttr {
let Spellings = ["global"];
}
-def CUDAHost : Attr {
+def CUDAHost : InheritableAttr {
let Spellings = ["host"];
}