diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Driver/cuda-constructor-alias.cu | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 814eb353c5c..6172baac43a 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3985,9 +3985,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("Arguments"); } - // Enable -mconstructor-aliases except on darwin, where we have to - // work around a linker bug; see <rdar://problem/7651567>. - if (!getToolChain().getTriple().isOSDarwin()) + // Enable -mconstructor-aliases except on darwin, where we have to work around + // a linker bug (see <rdar://problem/7651567>), and CUDA device code, where + // aliases aren't supported. + if (!getToolChain().getTriple().isOSDarwin() && + !getToolChain().getTriple().isNVPTX()) CmdArgs.push_back("-mconstructor-aliases"); // Darwin's kernel doesn't support guard variables; just die if we diff --git a/clang/test/Driver/cuda-constructor-alias.cu b/clang/test/Driver/cuda-constructor-alias.cu new file mode 100644 index 00000000000..76f8e4fc90b --- /dev/null +++ b/clang/test/Driver/cuda-constructor-alias.cu @@ -0,0 +1,13 @@ +// REQUIRES: clang-driver +// REQUIRES: x86-registered-target +// REQUIRES: nvptx-registered-target + +// Check that we don't pass -mconstructor-aliases to CUDA device-side +// compilation, but we do pass it to host-side compilation. + +// RUN: %clang -### %s 2>&1 | FileCheck %s +// CHECK: "-cc1" +// CHECK-NOT: "-fcuda-is-device" {{.*}}"-mconstructor-aliases" +// CHECK-NOT: "-mconstructor-aliases" {{.*}}"-fcuda-is-device" +// CHECK: "-cc1" +// CHECK-SAME: "-mconstructor-aliases" |
