[pypy-svn] r36914 - pypy/dist/pypy/translator/llvm

[ericvrp at codespeak.net]

Author: ericvrp
Date: Thu Jan 18 10:08:20 2007
New Revision: 36914

Modified:
   pypy/dist/pypy/translator/llvm/buildllvm.py
Log:
merge from pypy-llvm2-compatibility branch. No going to support the llvm2.x instructionset for now.
llvm-upgrade should do the trick nicely. Need to fill in a bugreport to make it understand pypy generated .ll files.


Modified: pypy/dist/pypy/translator/llvm/buildllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/buildllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/buildllvm.py	Thu Jan 18 10:08:20 2007
@@ -81,7 +81,11 @@
     # run llvm assembler and optimizer
     simple_optimizations = not optimize
     opts = optimizations(simple_optimizations, use_gcc)
-    cmds = ["llvm-as < %s.ll | opt %s -f -o %s.bc" % (b, opts, b)]
+    v = exe_version('llvm-as')
+    if v < 2.0:
+        cmds = ["llvm-as < %s.ll | opt %s -f -o %s.bc" % (b, opts, b)]
+    else: #we generate 1.x .ll files, so upgrade these first
+        cmds = ["llvm-upgrade < %s.ll | llvm-as | opt %s -f -o %s.bc" % (b, opts, b)]
 
     object_files = ["-L%s/lib" % distutils.sysconfig.EXEC_PREFIX]
     library_files = genllvm.db.gcpolicy.gc_libraries()