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

Author: ianamason

driver/popenwrapper.py

@@ -14,5 +14,5 @@ def Popen(*pargs, **kwargs):
     try:
         return subprocess.Popen(*pargs,**kwargs)
     except OSError:
-        _logger.error("WWLVM Failed to execute:\n" + pprint.pformat(pargs[0]))
+        _logger.error("WLLVM Failed to execute:\n" + pprint.pformat(pargs[0]))
         raise

driver/utils.py

@@ -223,7 +223,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         #
         # Patterns for other command-line arguments:
         # - inputFiles
-        # - objecFiles (suffix .o)
+        # - objectFiles (suffix .o)
         # - libraries + linker options as in -lxxx -Lpath or -Wl,xxxx
         # - preprocessor options as in -DXXX -Ipath
         # - compiler warning options: -W....
@@ -233,7 +233,10 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             r'^.+\.(c|cc|cpp|C|cxx|i|s|S)$' : (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)$' : (0, ArgumentListFilter.objectFileCallback),
+            r'^.+\.(o|lo|So|so|po|a|dylib)$' : (0, ArgumentListFilter.objectFileCallback),
+            #iam: library.so.4.5.6 probably need a similar pattern for .dylib too.
+            r'^.+\.dylib(\.\d)+$' : (0, ArgumentListFilter.objectFileCallback),
+            r'^.+\.(So|so)(\.\d)+$' : (0, ArgumentListFilter.objectFileCallback),
             r'^-(l|L).+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-I.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-D.+$' : (0, ArgumentListFilter.compileUnaryCallback),