diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | tools/ci/jobs/gcc5_lto.sh | 53 | ||||
| -rwxr-xr-x | tools/ci/jobs/gcc6_lto.sh | 25 |
3 files changed, 27 insertions, 55 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2739d462b..4a075247a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -281,10 +281,10 @@ gcc-6_tests: - ./tools/ci/jobs/gcc6_tests.sh image: debian:unstable -gcc-5_lto: +gcc-6_lto: stage: test script: - - ./tools/ci/jobs/gcc5_lto.sh + - ./tools/ci/jobs/gcc6_lto.sh image: debian:unstable gcc-5_sanitize_tests: diff --git a/tools/ci/jobs/gcc5_lto.sh b/tools/ci/jobs/gcc5_lto.sh deleted file mode 100755 index b60f38ef4..000000000 --- a/tools/ci/jobs/gcc5_lto.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -export CC=gcc-5 -export CXX=g++-5 -export LOGFILE=gcc5.log - -source ./tools/ci/scripts/init.sh - -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev - -export CXXFLAGS="-ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \ --fno-omit-frame-pointer -funswitch-loops \ --Wvariadic-macros -Wvla -Wredundant-decls \ --Wpacked-bitfield-compat -Wtrampolines \ --Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \ --fstrict-aliasing -Wunreachable-code \ --Wvolatile-register-var -Winvalid-pch -Wredundant-decls \ --Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \ --Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \ --Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \ --Wcast-align -Wpointer-arith -Wundef \ --Wmissing-include-dirs -Winit-self -pedantic -Wall \ --Wpacked -Wextra -fstrict-overflow -Wstrict-overflow=1 -Wunknown-pragmas \ --Wwrite-strings -Wstack-protector -Wshadow -Wunused-macros -Wsynth \ --Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated \ --Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ --Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -std=gnu++1y \ --Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ --Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ --Wnarrowing -Wzero-as-null-pointer-constant -funsafe-loop-optimizations \ --Waggressive-loop-optimizations -Wclobbered -Wempty-body \ --Wignored-qualifiers -Wliteral-suffix -Wmissing-field-initializers \ --Woverlength-strings -Wpedantic -Wsign-compare -Wsizeof-pointer-memaccess \ --Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ --Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ --Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv \ --fsched-pressure \ --Wconditionally-supported -Wdate-time \ --fno-var-tracking \ --Wopenmp-simd -Wformat-signedness \ --Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \ --Wlogical-not-parentheses -Woverloaded-virtual" - -do_init -run_configure --enable-werror -run_make - -source ./tools/ci/scripts/exit.sh - -exit 0 diff --git a/tools/ci/jobs/gcc6_lto.sh b/tools/ci/jobs/gcc6_lto.sh new file mode 100755 index 000000000..0a638828f --- /dev/null +++ b/tools/ci/jobs/gcc6_lto.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +export CC=gcc-6 +export CXX=g++-6 +export LOGFILE=gcc6.log + +source ./tools/ci/scripts/init.sh + +aptget_install gcc-6 g++-6 \ + make autoconf automake autopoint gettext libphysfs-dev \ + libxml2-dev libcurl4-gnutls-dev libpng-dev \ + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + +export CXXFLAGS="-ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \ +-fno-omit-frame-pointer -funswitch-loops -D_FORTIFY_SOURCE=2 -std=gnu++1z" + +source ./tools/ci/flags/gcc6.sh + +do_init +run_configure --enable-werror +run_make + +source ./tools/ci/scripts/exit.sh + +exit 0 |