Merge branch 'master' of https://github.com/travitch/whole-program-llvm

Author: travitch

README-freeBSD.md

@@ -67,7 +67,7 @@ to your shell startup (in '~/.profile' for bash):
 
     export LLVM_HOME=/usr/local/llvm-3.3
 
-Get LLVM and Clang version 3.5:
+Get LLVM and Clang version 3.3:
 
     svn co http://llvm.org/svn/llvm-project/llvm/branches/release_33 llvm
     cd llvm/tools

README.md

@@ -54,6 +54,11 @@ In addition to the above environment variables the following can be optionally u
    variable.
    Example `LLVM_COMPILER_PATH=/home/user/llvm_and_clang/Debug+Asserts/bin`.
 
+*  `WLLVM_CONFIGURE_ONLY` can be set to anything, when set `wllvm` and `wllvm++`
+   will not carry out the second phase that involves the production of bitcode.
+   This may prevent configuration errors being cause by the unexpected production
+   of the hidden bitcode files.
+
 Example building bitcode module
 ===============================
 
@@ -88,6 +93,15 @@ Example building an Operating System
 To see how to build freeBSD 10.0 from scratch check out the guide 
 [here.](../master/README-freeBSD.md)
 
+
+Example configuring without building bitcode
+================================
+
+
+    WLLVM_CONFIGURE_ONLY=1 CC=wllvm ./configure
+    CC=wllvm make
+    
+
 Debugging
 =========
 

driver/as

@@ -10,12 +10,11 @@
 # (which was created in the first compilation phase by the real
 # compiler).  We'll link this together at a later stage.
 
-import os
-import sys
-from utils import *
+from __future__ import absolute_import
+
+from .utils import *
 from subprocess import *
-from popenwrapper import Popen
-import logconfig
+from .popenwrapper import Popen
 
 
 class BCFilter(ArgumentListFilter):

driver/utils.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
 from subprocess import *
 import collections
 import pprint
@@ -7,26 +10,13 @@
 import re
 import sys
 import tempfile
+from .popenwrapper import Popen
 
 fullSelfPath = os.path.realpath(__file__)
 prefix = os.path.dirname(fullSelfPath)
 driverDir = prefix
 
-# This is a bit hacky.
-# We cannot do
-# from .popenwrapper import Popen
-# OR
-# from driver.popenwrapper import Popen
-# because then 'as' will not succesfully import us (wllvm/wllvm++ can
-# successfully import however).
-#
-# Using
-# from popenwrapper import Popen
-# will allow 'as' to import us but then wllvm/wllvm++ will not be able to.
-#
-# The work around is to put this directory in the search path for modules.
-sys.path.insert(0,driverDir)
-from popenwrapper import Popen
+
 
 # Environmental variable for path to compiler tools (clang/llvm-link etc..)
 llvmCompilerPathEnv = 'LLVM_COMPILER_PATH'
@@ -391,15 +381,15 @@ def getArtifactNames(self, srcFile, hidden=False):
 
     #iam: for printing our partitioning of the args
     def dump(self):
-        print "compileArgs: ", self.compileArgs
-        print "inputFiles: ", self.inputFiles
-        print "linkArgs: ", self.linkArgs
-        print "objectFiles: ", self.objectFiles
-        print "outputFilename: ", self.outputFilename
+        print("compileArgs: ", self.compileArgs)
+        print("inputFiles: ", self.inputFiles)
+        print("linkArgs: ", self.linkArgs)
+        print("objectFiles: ", self.objectFiles)
+        print("outputFilename: ", self.outputFilename)
         for srcFile in self.inputFiles:
-            print "srcFile: ", srcFile
+            print("srcFile: ", srcFile)
             (objFile, bcFile) = self.getArtifactNames(srcFile)
-            print "{0} ===> ({1}, {2})".format(srcFile, objFile, bcFile)
+            print("{0} ===> ({1}, {2})".format(srcFile, objFile, bcFile))
 
 
 

wllvm

@@ -8,6 +8,7 @@
 # library or executable.
 
 import sys
+import os
 from driver.utils import *
 import driver.logconfig
 
@@ -16,5 +17,7 @@ cmd = cmd[1:]
 
 builder = getBuilder(cmd, False)
 buildObject(builder)
-buildAndAttachBitcode(builder)
+if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+    buildAndAttachBitcode(builder)
+    
 

wllvm++

@@ -8,6 +8,7 @@
 # library or executable.
 
 import sys
+import os
 from driver.utils import *
 import driver.logconfig
 
@@ -16,4 +17,5 @@ cmd = cmd[1:]
 
 builder = getBuilder(cmd, True)
 buildObject(builder)
-buildAndAttachBitcode(builder)
+if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+    buildAndAttachBitcode(builder)