diff options
Diffstat (limited to 'debian/patches/testsuite-hardening-updates.diff')
| -rw-r--r-- | debian/patches/testsuite-hardening-updates.diff | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/debian/patches/testsuite-hardening-updates.diff b/debian/patches/testsuite-hardening-updates.diff index 0f3f7e7..33a38a9 100644 --- a/debian/patches/testsuite-hardening-updates.diff +++ b/debian/patches/testsuite-hardening-updates.diff @@ -2,7 +2,6 @@ --- src/gcc/testsuite/c-c++-common/asan/strncpy-overflow-1.c | 2 +- - src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c | 2 +- src/gcc/testsuite/g++.dg/asan/asan_test.C | 2 +- src/gcc/testsuite/g++.dg/asan/interception-malloc-test-1.C | 2 +- src/gcc/testsuite/g++.dg/fstack-protector-strong.C | 2 +- @@ -22,8 +21,8 @@ Index: b/src/gcc/testsuite/g++.dg/asan/asan_test.C // { dg-skip-if "" { *-*-* } { "*" } { "-O2" } } // { dg-skip-if "" { *-*-* } { "-flto" } { "" } } // { dg-additional-sources "asan_globals_test-wrapper.cc" } --// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Wno-format -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" } -+// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Wno-format -Wno-unused-result -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" } +-// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" } ++// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -Wno-unused-result -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" } // { dg-additional-options "-DASAN_NEEDS_SEGV=1" { target { ! arm*-*-* } } } // { dg-additional-options "-DASAN_LOW_MEMORY=1 -DASAN_NEEDS_SEGV=0" { target arm*-*-* } } // { dg-additional-options "-DASAN_AVOID_EXPENSIVE_TESTS=1" { target { ! run_expensive_tests } } } @@ -81,7 +80,7 @@ Index: b/src/gcc/testsuite/gcc.dg/stack-usage-1.c -/* { dg-options "-fstack-usage" } */ +/* { dg-options "-fstack-usage -fno-stack-protector" } */ /* nvptx doesn't have a reg allocator, and hence no stack usage data. */ - /* { dg-skip-if "" { nvptx-*-* } { "*" } { "" } } */ + /* { dg-skip-if "" { nvptx-*-* } } */ Index: b/src/gcc/testsuite/gcc.target/i386/sw-1.c =================================================================== @@ -91,20 +90,9 @@ Index: b/src/gcc/testsuite/gcc.target/i386/sw-1.c /* { dg-do compile } */ -/* { dg-options "-O2 -mtune=generic -fshrink-wrap -fdump-rtl-pro_and_epilogue" } */ +/* { dg-options "-O2 -mtune=generic -fshrink-wrap -fdump-rtl-pro_and_epilogue -fno-stack-protector" } */ - /* { dg-skip-if "No shrink-wrapping preformed" { x86_64-*-mingw* } { "*" } { "" } } */ + /* { dg-skip-if "No shrink-wrapping preformed" { x86_64-*-mingw* } } */ #include <string.h> -Index: b/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c -=================================================================== ---- a/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c -+++ b/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c -@@ -1,5 +1,5 @@ - /* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ --/* { dg-options "-fcilkplus -w" } */ -+/* { dg-options "-fcilkplus -w -U_FORTIFY_SOURCE" } */ - /* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ - - #include <stdio.h> Index: b/src/gcc/testsuite/gcc.dg/fstack-protector-strong.c =================================================================== --- a/src/gcc/testsuite/gcc.dg/fstack-protector-strong.c |