summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2012-05-28 20:42:15 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2012-05-28 20:42:15 +0000
commit5ea05cf610d3c536ec370879b6424a89156d2004 (patch)
tree1ddc2278495309febdede54c0be4812d0bcfc7fd
parentc328076bc364f086139983a2ef9ea5a347020e33 (diff)
Switch to the NVPTX backend.
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@157589 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xcompile-test.sh2
-rwxr-xr-xconfigure.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/compile-test.sh b/compile-test.sh
index f322fbd..d0f4bb4 100755
--- a/compile-test.sh
+++ b/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/configure.py b/configure.py
index 310122b..829ce6b 100755
--- a/configure.py
+++ b/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')