Merge pull request diffblue#2217 from diffblue/c-preprocessing-cleanout

use compiler defaults for gcc defines

Author: Daniel Kroening

.travis.yml

@@ -83,6 +83,7 @@ jobs:
             - g++-5
             - libubsan0
             - parallel
+            - libc6-dev-i386
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
       # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
@@ -115,6 +116,7 @@ jobs:
             - libwww-perl
             - g++-5
             - libubsan0
+            - libc6-dev-i386
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
       # env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
@@ -140,8 +142,9 @@ jobs:
             - libstdc++-5-dev
             - libubsan0
             - parallel
+            - libc6-dev-i386
       before_install:
-        - mkdir bin ; ln -s /usr/bin/clang-3.7 bin/gcc
+        - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
         - export CCACHE_CPP2=yes
       # env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
       env:
@@ -165,8 +168,9 @@ jobs:
             - clang-3.7
             - libstdc++-5-dev
             - libubsan0
+            - libc6-dev-i386
       before_install:
-        - mkdir bin ; ln -s /usr/bin/clang-3.7 bin/gcc
+        - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
         - export CCACHE_CPP2=yes
       # env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
       env:
@@ -188,6 +192,7 @@ jobs:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
+            - libc6-dev-i386
       before_install:
         - mkdir bin ; ln -s /usr/bin/gcc-5 bin/gcc
       install:

buildspec.yml

@@ -6,7 +6,7 @@ phases:
       - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/toolchain.list
       - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
       - apt-get update -y
-      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache
+      - apt-get install -y g++-5 flex bison make git libwww-perl patch ccache libc6-dev-i386
       - apt-get install -y openjdk-7-jdk
       - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 1
       - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1

regression/cbmc/Promotion4/main.c renamed to regression/cbmc/Promotion4/main.i

@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --16
 ^EXIT=0$
 ^SIGNAL=0$