Initial implementation of idea to handle -emit-llvm.

Author: ianamason

test/test_files/Makefile

@@ -9,6 +9,13 @@ zero_e:
 	${CXX} hello.bc -o hello
 
 
+e:
+	${CC} -emit-llvm  foo.c  -c
+	${CC} -emit-llvm  bar.c  -c
+	${CC} -emit-llvm  baz.c -c
+	${CC} -emit-llvm  main.c -c
+	${CC} foo.bc bar.bc baz.bc main.bc -o main
+
 
 one:
 	${CC} foo.c bar.c baz.c main.c -o main
@@ -59,4 +66,3 @@ mystery:
 	otool -X -s __WLLVM __llvm_bc main > main.otool
 	xxd -r main.otool
 	xxd -r main.otool main.xxd
-

wllvm/arglistfilter.py

@@ -50,7 +50,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
 
 
             #iam: if this happens, then we need to stop and think.
-            '-emit-llvm' : (0, ArgumentListFilter.abortUnaryCallback),
+            '-emit-llvm' : (0, ArgumentListFilter.emitLLVMCallback),
 
             #iam: buildworld and buildkernel use these flags
             '-pipe' : (0, ArgumentListFilter.compileUnaryCallback),
@@ -212,7 +212,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         # - optimiziation and other flags: -f...
         #
         defaultArgPatterns = {
-            r'^.+\.(c|cc|cpp|C|cxx|i|s|S)$' : (0, ArgumentListFilter.inputFileCallback),
+            r'^.+\.(c|cc|cpp|C|cxx|i|s|S|bc)$' : (0, ArgumentListFilter.inputFileCallback),
             #iam: the object file recogition is not really very robust, object files
             # should be determined by their existance and contents...
             r'^.+\.(o|lo|So|so|po|a|dylib)$' : (0, ArgumentListFilter.objectFileCallback),
@@ -252,6 +252,8 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         self.isAssembleOnly = False
         self.isAssembly = False
         self.isCompileOnly = False
+        self.isEmitLLVM = False
+
 
         argExactMatches = dict(defaultArgExactMatches)
         argExactMatches.update(exactMatches)
@@ -339,6 +341,11 @@ def compileOnlyCallback(self, flag):
         _logger.debug('compileOnlyCallback: %s', flag)
         self.isCompileOnly = True
 
+    def emitLLVMCallback(self, flag):
+        _logger.debug('emitLLVMCallback: %s', flag)
+        self.isEmitLLVM = True
+        self.isCompileOnly = True
+
     def linkUnaryCallback(self, flag):
         _logger.debug('linkUnaryCallback: %s', flag)
         self.linkArgs.append(flag)

wllvm/compilers.py

@@ -28,11 +28,10 @@ def wcompile(isCXX):
         builder = getBuilder(cmd, isCXX)
         rc = buildObject(builder)
 
-
         if rc == 0 and not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
             buildAndAttachBitcode(builder)
     except Exception as e:
-        _logger.debug('wllvm++: exception case: %s', str(e))
+        _logger.debug('%s: exception case: %s', "wllvm++" if isCXX else "wllvm", str(e))
 
     return rc
 
@@ -252,7 +251,7 @@ def buildAndAttachBitcode(builder):
 
     af = builder.getBitcodeArglistFilter()
 
-    if len(af.inputFiles) == 0 or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly:
+    if len(af.inputFiles) == 0 or af.isEmitLLVM or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly:
         _logger.debug('No work to do')
         _logger.debug(af.__dict__)
         return
@@ -281,12 +280,19 @@ def buildAndAttachBitcode(builder):
     else:
 
         for srcFile in af.inputFiles:
+            _logger.debug('Not compile only case: %s', srcFile)
             (objFile, bcFile) = af.getArtifactNames(srcFile, hidden)
             if hidden:
                 buildObjectFile(builder, srcFile, objFile)
                 newObjectFiles.append(objFile)
-            buildBitcodeFile(builder, srcFile, bcFile)
-            attachBitcodePathToObject(bcFile, objFile)
+
+            if srcFile.endswith('.bc'):
+                _logger.debug('attaching %s to %s', srcFile, objFile)
+                attachBitcodePathToObject(srcFile, objFile)
+            else:
+                _logger.debug('building and attaching %s to %s', bcFile, objFile)
+                buildBitcodeFile(builder, srcFile, bcFile)
+                attachBitcodePathToObject(bcFile, objFile)
 
 
     if not af.isCompileOnly: