Merge pull request travitch#85 from SRI-CSL/master

This is 1.2.7 in the pipishpere

Author: ianamason

.travis.yml

@@ -33,7 +33,8 @@ script:
 #  - python -m unittest discover test/ || exit 1
   - export WLLVM_HOME=`pwd`
   - ${WLLVM_HOME}/.travis/store.sh
-  - export APACHE_VER=2.4.18
+  - export APACHE_URL=https://www-us.apache.org/dist/httpd/
+  - export APACHE_VER=2.4.39
   # build apache with clang
   - ${WLLVM_HOME}/.travis/apache_clang.sh
   # build apache with gcc and dragonegg

.travis/apache_clang.sh

@@ -9,7 +9,7 @@ export WLLVM_OUTPUT=WARNING
 
 wllvm-sanity-checker
 
-wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
+wget ${APACHE_URL}httpd-${APACHE_VER}.tar.gz
 
 tar xfz httpd-${APACHE_VER}.tar.gz
 mv httpd-${APACHE_VER} apache_clang
@@ -26,9 +26,3 @@ then
 else
     exit 1
 fi
-
-
-
-
-
-

.travis/apache_dragonegg.sh

@@ -13,8 +13,7 @@ export WLLVM_OUTPUT=WARNING
 
 wllvm-sanity-checker
 
-wget https://archive.apache.org/dist/httpd/httpd-${APACHE_VER}.tar.gz
-
+wget ${APACHE_URL}httpd-${APACHE_VER}.tar.gz
 
 tar xfz httpd-${APACHE_VER}.tar.gz
 mv httpd-${APACHE_VER} apache_dragonegg
@@ -30,9 +29,3 @@ then
 else
     exit 1
 fi
-
-
-
-
-
-

wllvm/arglistfilter.py

@@ -88,10 +88,10 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-msoft-float' : (0, ArgumentListFilter.compileUnaryCallback),
             '-m3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
             '-mno-3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
-            '-m16': (0, ArgumentListFilter.compileUnaryCallback),
-            '-m32': (0, ArgumentListFilter.compileUnaryCallback),
-            '-mx32': (0, ArgumentListFilter.compileUnaryCallback),
-            '-m64': (0, ArgumentListFilter.compileUnaryCallback),
+            '-m16': (0, ArgumentListFilter.compileLinkUnaryCallback),
+            '-m32': (0, ArgumentListFilter.compileLinkUnaryCallback),
+            '-mx32': (0, ArgumentListFilter.compileLinkUnaryCallback),
+            '-m64': (0, ArgumentListFilter.compileLinkUnaryCallback),
             '-miamcu': (0, ArgumentListFilter.compileUnaryCallback),
             '-mstackrealign': (0, ArgumentListFilter.compileUnaryCallback),
             '-mretpoline-external-thunk': (0, ArgumentListFilter.compileUnaryCallback),  #iam: linux kernel stuff

wllvm/version.py

@@ -74,7 +74,8 @@
 
 1.2.5    - 4/17/2019 Fixing the pip package, hopefully.
 
+1.2.6    - 6/18/2019 Various compiler cmd line options parsing tweaks."
 """
 
-wllvm_version = '1.2.5'
-wllvm_date = 'April 17 2019'
+wllvm_version = '1.2.6'
+wllvm_date = 'June 18 2019'