[llvm-commits] [hlvm] r38417 - in /hlvm/trunk: build/check.py build/configure.py build/hlvm.py test/lib/generate.exp test/lib/return0.exp

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:03:11 2007
New Revision: 38417

URL: http://llvm.org/viewvc/llvm-project?rev=38417&view=rev
Log:
Changes for gccld -> llvm-ld. This gets "make check" partially working.

Modified:
    hlvm/trunk/build/check.py
    hlvm/trunk/build/configure.py
    hlvm/trunk/build/hlvm.py
    hlvm/trunk/test/lib/generate.exp
    hlvm/trunk/test/lib/return0.exp

Modified: hlvm/trunk/build/check.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/check.py?rev=38417&r1=38416&r2=38417&view=diff

==============================================================================
--- hlvm/trunk/build/check.py (original)
+++ hlvm/trunk/build/check.py Sat Jul  7 19:03:11 2007
@@ -38,7 +38,7 @@
   outf.write('set APRU_lib "' + env['APRU_lib'] + '"\n')
   outf.write('set APRU_inc "' + env['APRU_inc'] + '"\n')
   outf.write('set llc "' + env['with_llc'] + '"\n')
-  outf.write('set gccld "' + env['with_gccld'] + '"\n')
+  outf.write('set llvm_ld "' + env['with_llvm_ld'] + '"\n')
   outf.write('set gxx "' + env['with_gxx'] + '"\n')
   outf.write('## All vars above are generated by scons. Do Not Edit!\n')
   outf.close()

Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38417&r1=38416&r2=38417&view=diff

==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul  7 19:03:11 2007
@@ -244,7 +244,7 @@
   conf.CheckProgram('llvm-as','with_llvmas',[conf.env['LLVM_bin']])
   conf.CheckProgram('llvm2cpp','with_llvm2cpp',[conf.env['LLVM_bin']])
   conf.CheckProgram('llvm-ar','with_llvmar',[conf.env['LLVM_bin']])
-  conf.CheckProgram('gccld','with_gccld',[conf.env['LLVM_bin']])
+  conf.CheckProgram('llvm-ld','with_llvm_ld',[conf.env['LLVM_bin']])
   conf.CheckProgram('llvm-gcc','with_llvmgcc')
   conf.CheckProgram('llvm-g++','with_llvmgxx')
   conf.CheckProgram('gperf','with_gperf')

Modified: hlvm/trunk/build/hlvm.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/hlvm.py?rev=38417&r1=38416&r2=38417&view=diff

==============================================================================
--- hlvm/trunk/build/hlvm.py (original)
+++ hlvm/trunk/build/hlvm.py Sat Jul  7 19:03:11 2007
@@ -151,8 +151,8 @@
            '/usr/local/bin/g++')
   opts.Add('with_llc','Specify where the LLVM compiler is located',
            '/usr/local/bin/llc')
-  opts.Add('with_gccld','Specify where the LLVM GCC Linker is located',
-           '/usr/local/bin/gccld')
+  opts.Add('with_llvm_ld','Specify where the LLVM GCC Linker is located',
+           '/usr/local/bin/llvm-ld')
   opts.Add('with_llvmdis','Specify where the LLVM disassembler is located',
            '/usr/local/bin/llvm-dis')
   opts.Add('with_llvmas','Specify where the LLVM assembler is located',

Modified: hlvm/trunk/test/lib/generate.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/lib/generate.exp?rev=38417&r1=38416&r2=38417&view=diff

==============================================================================
--- hlvm/trunk/test/lib/generate.exp (original)
+++ hlvm/trunk/test/lib/generate.exp Sat Jul  7 19:03:11 2007
@@ -21,7 +21,7 @@
 # 
 #===------------------------------------------------------------------------===#
 proc hlvm-generate-test { complexity typecomplexity size seed } {
-  global srcdir subdir objdir tmpdir objrootdir llc gccld gxx APR_lib
+  global srcdir subdir objdir tmpdir objrootdir llc llvm_ld gxx APR_lib
   set outdir [file join $objdir $subdir]
   set gentc [ file join $objrootdir tools hlvm-gentestcase hlvm-gentestcase ]
   set compiler [file join $objrootdir tools hlvm-compiler hlvm-compiler ]
@@ -47,9 +47,9 @@
     if { $retval != 0 } {
       fail "$test: hlvm-compiler returned $retval:\n$msg"
     } else {
-      set retval [ catch { exec $gccld -o $testlinked $testbc $vmmain $rtlib } msg ]
+      set retval [ catch { exec $llvm_ld -o $testlinked $testbc $vmmain $rtlib } msg ]
       if { $retval != 0 } {
-        fail "$test: gccld returned $retval:\n$msg"
+        fail "$test: llvm-ld returned $retval:\n$msg"
       } else {
         set retval [ catch { exec $llc -fast -f -o $tests $testlinkedbc } msg ]
         if { $retval != 0 } {

Modified: hlvm/trunk/test/lib/return0.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/lib/return0.exp?rev=38417&r1=38416&r2=38417&view=diff

==============================================================================
--- hlvm/trunk/test/lib/return0.exp (original)
+++ hlvm/trunk/test/lib/return0.exp Sat Jul  7 19:03:11 2007
@@ -21,7 +21,7 @@
 # 
 #===------------------------------------------------------------------------===#
 proc hlvm-ret-zero-test { pat forceret0 } {
-  global srcdir subdir objdir tmpdir objrootdir llc gccld gxx APR_lib
+  global srcdir subdir objdir tmpdir objrootdir llc llvm_ld gxx APR_lib
   set outdir [file join $objdir $subdir]
   set compiler [file join $objrootdir tools hlvm-compiler hlvm-compiler ]
   set source [file join $srcdir $subdir ]
@@ -57,9 +57,9 @@
     if { $retval != 0 } {
       fail "$test: hlvm-compiler returned $retval:\n$msg"
     } else {
-      set retval [ catch { exec $gccld -o $testlinked $testbc $vmmain $rtlib } msg ]
+      set retval [ catch { exec $llvm_ld -o $testlinked $testbc $vmmain $rtlib } msg ]
       if { $retval != 0 } {
-        fail "$test: gccld returned $retval:\n$msg"
+        fail "$test: llvm-ld returned $retval:\n$msg"
       } else {
         set retval [ catch { exec $llc -fast -f -o $tests $testlinkedbc } msg ]
         if { $retval != 0 } {