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

Conflicts:
	driver/utils.py

Author: ianamason

driver/utils.py

@@ -215,13 +215,12 @@ 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|po|a)$' : (0, ArgumentListFilter.objectFileCallback),
+            r'^.+\.(o|lo|So|so|po|a)$' : (0, ArgumentListFilter.objectFileCallback),
             r'^-(l|L).+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-I.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-D.+$' : (0, ArgumentListFilter.compileUnaryCallback),
-            #iam: hopefully the order of these is preserved, time will tell
             r'^-Wl,.+$' : (0, ArgumentListFilter.linkUnaryCallback),
-            r'^-W.+$' : (0, ArgumentListFilter.compileUnaryCallback),
+            r'^-W(?!l,).*$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-f.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-std=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
         }