Merging in tristan's updates.

Author: ianamason

.travis/apache_clang.sh

@@ -12,7 +12,6 @@ wget http://apache.mirrors.pair.com//httpd/httpd-${APACHE_VER}.tar.gz
 tar xfz httpd-${APACHE_VER}.tar.gz
 mv httpd-${APACHE_VER} apache_clang
 
-
 cd apache_clang
 CC=wllvm ./configure
 make

driver/utils.py

@@ -88,6 +88,10 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-integrated-as' : (0, ArgumentListFilter.compileUnaryCallback),
             #iam: gcc uses this in both compile and link, but clang only in compile
             '-pthread' : (0, ArgumentListFilter.compileUnaryCallback),
+            # I think this is a compiler search path flag.  It is
+            # clang only, so I don't think it counts as a separate CPP
+            # flag.  Android uses this flag with its clang builds.
+            '-nostdlibinc': (0, ArgumentListFilter.compileUnaryCallback),
 
             #iam: arm stuff
             '-mno-omit-leaf-frame-pointer' : (0, ArgumentListFilter.compileUnaryCallback),
@@ -108,8 +112,10 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-msoft-float' : (0, ArgumentListFilter.compileUnaryCallback),
             '-m3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
             '-mno-3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
+            '-m32': (0, ArgumentListFilter.compileUnaryCallback),
+            '-m64': (0, ArgumentListFilter.compileUnaryCallback),
+            '-mstackrealign': (0, ArgumentListFilter.compileUnaryCallback),
 
-            
             # Preprocessor assertion
             '-A' : (1, ArgumentListFilter.compileBinaryCallback),
             '-D' : (1, ArgumentListFilter.compileBinaryCallback),
@@ -229,6 +235,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             r'^-(l|L).+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-I.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-D.+$' : (0, ArgumentListFilter.compileUnaryCallback),
+            r'^-U.+$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-Wl,.+$' : (0, ArgumentListFilter.linkUnaryCallback),
             r'^-W(?!l,).*$' : (0, ArgumentListFilter.compileUnaryCallback),
             r'^-f.+$' : (0, ArgumentListFilter.compileUnaryCallback),
@@ -238,7 +245,6 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
 
         }
 
-
         #iam: try and keep track of the files, input object, and output
         self.inputList = inputList
         self.inputFiles = []