[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  10fe37dd1bb7f75ca68a442406c09ada6735f38b (commit)
      from  1ae891c6b15e28b280845858326fb50ea5b61ac7 (commit)


- Log -----------------------------------------------------------------
commit 10fe37dd1bb7f75ca68a442406c09ada6735f38b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sat May 26 17:08:03 2018 +0200

    Try to work around ubuntu gcc-5 ubsan build failure
    
    [extended tests]
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6362)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e20c208..1c1db2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ matrix:
                   sources:
                       - ubuntu-toolchain-r-test
           compiler: gcc-5
-          env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
+          env: UBUNTU_GCC_HACK="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
         - os: linux
           addons:
               apt:
@@ -112,6 +112,10 @@ before_script:
           srcdir=.;
           top=.;
       fi
+    - if [ -n "$UBUNTU_GCC_HACK" ]; then
+          $CC -dumpspecs | sed "s/--push-state//g; s/--pop-state/--as-needed/g" > gcc-specs.txt;
+          CC="$CC -specs=gcc-specs.txt";
+      fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
           $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;