[gcc r12-5156] Testsuite: Various fixes for nios2.

[gcc r12-5156] Testsuite: Various fixes for nios2.

[Sandra Loosemore]

https://gcc.gnu.org/g:1ea781a8657cdbecffa14b5bce960738087e58f3

commit r12-5156-g1ea781a8657cdbecffa14b5bce960738087e58f3
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Thu Nov 11 06:31:02 2021 -0800

    Testsuite: Various fixes for nios2.
    
    2021-11-11  Sandra Loosemore  <sandra@codesourcery.com>
    
            gcc/testsuite/
            * g++.dg/warn/Wmismatched-new-delete-5.C: Add
            -fdelete-null-pointer-checks.
            * gcc.dg/attr-returns-nonnull.c: Likewise.
            * gcc.dg/debug/btf/btf-datasec-1.c: Add -G0 option for nios2.
            * gcc.dg/ifcvt-4.c: Skip on nios2.
            * gcc.dg/struct-by-value-1.c: Add -G0 option for nios2.

Diff:
---
 gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-5.C | 2 +-
 gcc/testsuite/gcc.dg/attr-returns-nonnull.c          | 2 +-
 gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c       | 1 +
 gcc/testsuite/gcc.dg/ifcvt-4.c                       | 2 +-
 gcc/testsuite/gcc.dg/struct-by-value-1.c             | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-5.C b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-5.C
index 92c75df40d9..bac2b68aa64 100644
--- a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-5.C
+++ b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-5.C
@@ -1,7 +1,7 @@
 /* PR c++/100876 - -Wmismatched-new-delete should either look through
    or ignore placement new
    { dg-do compile }
-   { dg-options "-O2 -Wall" } */
+   { dg-options "-O2 -Wall -fdelete-null-pointer-checks" } */
 
 extern "C" {
   void* malloc (__SIZE_TYPE__);
diff --git a/gcc/testsuite/gcc.dg/attr-returns-nonnull.c b/gcc/testsuite/gcc.dg/attr-returns-nonnull.c
index 22ee30ac5df..e4e20b889ac 100644
--- a/gcc/testsuite/gcc.dg/attr-returns-nonnull.c
+++ b/gcc/testsuite/gcc.dg/attr-returns-nonnull.c
@@ -1,7 +1,7 @@
 /* Verify that attribute returns_nonnull on global and local function
    declarations is merged.
    { dg-do compile }
-   { dg-options "-Wall -fdump-tree-optimized" } */
+   { dg-options "-Wall -fdump-tree-optimized -fdelete-null-pointer-checks" } */
 
 void foo (void);
 
diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c
index f809d9347cf..dbb236bbda1 100644
--- a/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c
+++ b/gcc/testsuite/gcc.dg/debug/btf/btf-datasec-1.c
@@ -12,6 +12,7 @@
 /* { dg-do compile )  */
 /* { dg-options "-O0 -gbtf -dA" } */
 /* { dg-options "-O0 -gbtf -dA -msdata=none" { target { { powerpc*-*-* } && ilp32 } } } */
+/* { dg-options "-O0 -gbtf -dA -G0" { target { nios2-*-* } } } */
 
 /* Check for two DATASEC entries with vlen 3, and one with vlen 1.  */
 /* { dg-final { scan-assembler-times "0xf000003\[\t \]+\[^\n\]*btt_info" 2 } } */
diff --git a/gcc/testsuite/gcc.dg/ifcvt-4.c b/gcc/testsuite/gcc.dg/ifcvt-4.c
index e74e449b402..05251024a81 100644
--- a/gcc/testsuite/gcc.dg/ifcvt-4.c
+++ b/gcc/testsuite/gcc.dg/ifcvt-4.c
@@ -2,7 +2,7 @@
 /* { dg-additional-options "-misel" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-march=z196" { target { s390x-*-* } } } */
 /* { dg-additional-options "-mtune-ctrl=^one_if_conv_insn" { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-skip-if "Multiple set if-conversion not guaranteed on all subtargets" { "arm*-*-* avr-*-* hppa*64*-*-* s390-*-* visium-*-*" riscv*-*-* msp430-*-* } }  */
+/* { dg-skip-if "Multiple set if-conversion not guaranteed on all subtargets" { "arm*-*-* avr-*-* hppa*64*-*-* s390-*-* visium-*-*" riscv*-*-* msp430-*-* nios2-*-*} }  */
 /* { dg-skip-if "" { "s390x-*-*" } { "-m31" } }  */
 
 typedef int word __attribute__((mode(word)));
diff --git a/gcc/testsuite/gcc.dg/struct-by-value-1.c b/gcc/testsuite/gcc.dg/struct-by-value-1.c
index addf253d8e2..ae7adb5fc83 100644
--- a/gcc/testsuite/gcc.dg/struct-by-value-1.c
+++ b/gcc/testsuite/gcc.dg/struct-by-value-1.c
@@ -1,6 +1,7 @@
 /* Test structure passing by value.  */
 /* { dg-do run } */
 /* { dg-options "-O2" } */
+/* { dg-options "-O2 -G0" { target { nios2-*-* } } } */
 
 #define T(N)					\
 struct S##N { unsigned char i[N]; };		\