Skip to content

use compiler defaults for gcc defines #2217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 4, 2018
Merged

use compiler defaults for gcc defines #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfae4e3
enable Travis to do -m32
May 22, 2018
24210e9
enable AWS Codebuild to do -m32
May 22, 2018
a31f530
remove need to do preprocessing on 16-bit test
May 22, 2018
f653dec
use compiler defaults for gcc defines
May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change? Is gcc-5 even installed in this configuration?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that clang on Travis won't allow the -m32.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems rather weird - what's the error message?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can't find the 32-bit headers; clang has it's own headers, so there may well be a package that adds the 32-bit headers for clang.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it still seems a bit magical that gcc-5 is even present. But ok, it works... As this might break at some random future point (or, equally, clang packages be fixed), could the commit message please be made verbose to explain what is going on here? Moving to some other version of GCC will be painful if it cannot be found out what is going on in those lines.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it still seems a bit magical that gcc-5 is even present.

libstdc++-5-dev (https://github.com/diffblue/cbmc/pull/2217/files#diff-354f30a63fb0907d4ad57269548329e3R169) depends on package gcc-5

- export CCACHE_CPP2=yes
# env: COMPILER=clang++-3.7 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined,integer -fno-omit-frame-pointer"
env:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion buildspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 regression/cbmc/Promotion4/main.c → regression/cbmc/Promotion4/main.i
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion regression/cbmc/Promotion4/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CORE
main.c
main.i
--16
^EXIT=0$
^SIGNAL=0$
Expand Down
Loading