[cfe-commits] [libclc] r157589 - in /libclc/trunk: compile-test.sh configure.py

[Peter Collingbourne]

Author: pcc
Date: Mon May 28 15:42:15 2012
New Revision: 157589

URL: http://llvm.org/viewvc/llvm-project?rev=157589&view=rev
Log:
Switch to the NVPTX backend.

Modified:
    libclc/trunk/compile-test.sh
    libclc/trunk/configure.py

Modified: libclc/trunk/compile-test.sh
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/compile-test.sh?rev=157589&r1=157588&r2=157589&view=diff
==============================================================================
--- libclc/trunk/compile-test.sh (original)
+++ libclc/trunk/compile-test.sh Mon May 28 15:42:15 2012
@@ -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 "$@"

Modified: libclc/trunk/configure.py
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=157589&r1=157588&r2=157589&view=diff
==============================================================================
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Mon May 28 15:42:15 2012
@@ -40,7 +40,7 @@
 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 @@
 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')