Switch to the NVPTX backend.

llvm-svn: 157589

diff --git a/libclc/compile-test.sh b/libclc/compile-test.sh
index f322fbd..d0f4bb4 100755 (executable)
--- a/libclc/compile-test.sh
+++ b/libclc/compile-test.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-clang -ccc-host-triple ptx32--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang ptx32--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers "$@"
+clang -ccc-host-triple nvptx--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang nvptx--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers "$@"

diff --git a/libclc/configure.py b/libclc/configure.py
index 310122b..829ce6b 100755 (executable)
--- a/libclc/configure.py
+++ b/libclc/configure.py
@@ -40,7 +40,7 @@ llvm_clang = os.path.join(llvm_bindir, 'clang')
 llvm_link = os.path.join(llvm_bindir, 'llvm-link')
 llvm_opt = os.path.join(llvm_bindir, 'opt')
 
-default_targets = ['ptx32--nvidiacl', 'ptx64--nvidiacl']
+default_targets = ['nvptx--nvidiacl', 'nvptx64--nvidiacl']
 
 targets = args
 if not targets:
@@ -73,7 +73,7 @@ manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build', 'metabuild.py'),
 for target in targets:
   (t_arch, t_vendor, t_os) = target.split('-')
   archs = [t_arch]
-  if t_arch == 'ptx32' or t_arch == 'ptx64':
+  if t_arch == 'nvptx' or t_arch == 'nvptx64':
     archs.append('ptx')
   archs.append('generic')