undo changes to .travis.yml and library_check.sh

Author: hannes-steffenhagen-diffblue

.travis.yml

@@ -330,7 +330,6 @@ jobs:
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
         - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
-        - sudo update-alternative --install /usr/bin/gcc gcc /usr/bin/gcc-5 90
         - g++ --version
       # Coverity runs as part of before_script
       env:
@@ -344,7 +343,7 @@ install:
   - ccache --max-size=1G
   - make -C jbmc/src setup-submodules
   - make -C src minisat2-download
-  - make CC=gcc-5 -C src/ansi-c library_check
+  - make -C src/ansi-c library_check
   - make -C src/cpp library_check
   - make -C src "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j3
   - make -C jbmc/src "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j3

src/ansi-c/library_check.sh

@@ -1,17 +1,12 @@
 #!/usr/bin/env bash
 
 CC=$1
-echo "C COMPILER THAT IS BEING USED: $CC"
-$CC --version
 shift
 
 for f in "$@"; do
     echo "Checking ${f}"
     cp "${f}" __libcheck.c
-    # I don’t know why we’re not allowed to match a 'v' (that was already there)
-    # but __builtin_add_overflow/__builtin_sub_overflow and __builtin_mul_overflow
-    # are being used in implementations so they shouldn’t be replaced.
-    perl -p -i -e 's/(__builtin_(?!v|add_overflow|sub_overflow|mul_overflow))/s$1/' __libcheck.c
+    perl -p -i -e 's/(__builtin_[^v])/s$1/' __libcheck.c
     perl -p -i -e 's/(_mm_.fence)/s$1/' __libcheck.c
     perl -p -i -e 's/(__sync_)/s$1/' __libcheck.c
     perl -p -i -e 's/(__atomic_)/s$1/' __libcheck.c