Merge branch 'master' into tstellar-masterHEADmaster

1 files changed, 8 insertions, 9 deletions

diff --git a/configure.py b/configure.py
index 347f3b3..79cc4df 100755
--- a/configure.py
+++ b/configure.py
@@ -61,7 +61,8 @@ def llvm_config(args):
     sys.exit(1)
 
 llvm_bindir = llvm_config(['--bindir'])
-llvm_core_libs = llvm_config(['--ldflags', '--libs', 'core', 'bitreader', 'bitwriter'])
+llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \
+                 llvm_config(['--ldflags'])
 llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
 
 llvm_clang = os.path.join(llvm_bindir, 'clang')
@@ -74,10 +75,12 @@ available_targets = {
                 {'gpu' : 'cypress', 'aliases' : ['hemlock']},
                 {'gpu' : 'barts',   'aliases' : ['turks', 'caicos']},
                 {'gpu' : 'cayman',  'aliases' : ['aruba']},
-                {'gpu' : 'tahiti',  'aliases' : ['pitcairn', 'verde', 'oland']}]}
+                {'gpu' : 'tahiti',  'aliases' : ['pitcairn', 'verde', 'oland']}]},
+  'nvptx--nvidiacl'   : { 'devices' : [{'gpu' : '', 'aliases' : []}] },
+  'nvptx64--nvidiacl' : { 'devices' : [{'gpu' : '', 'aliases' : []}] }
 }
 
-default_targets = ['r600--']
+default_targets = ['nvptx--nvidiacl', 'nvptx64--nvidiacl', 'r600--']
 
 targets = args
 if not targets:
@@ -170,12 +173,8 @@ for target in targets:
 
       for src in open(subdir_list_file).readlines():
         src = src.rstrip()
-        # Only add the base filename (e.g. Add get_global_id instead of
-        # get_global_id.cl) to sources_seen.
-        # This allows targets to overide generic .cl sources with .ll sources.
-        src_base = os.path.splitext(src)[0]
-        if src_base not in sources_seen:
-          sources_seen.add(src_base)
+        if src not in sources_seen:
+          sources_seen.add(src)
           obj = os.path.join(target, 'lib', src + obj_suffix + '.bc')
           objects.append(obj)
           src_file = os.path.join(libdir, src)