From 30e8d8754d68eeadb7c27e84edd61a78eb6c1801 Mon Sep 17 00:00:00 2001
From: Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
Date: Wed, 3 Aug 2016 11:50:32 +0000
Subject: [PATCH] Fix tests that break unnecessarily for avr.

Require int32plus for tests that assume so, and conditionally skip pr44024.c,
 as it only works if the target allows deletion of null pointer checks.

gcc/testsuite/ChangeLog

	* gcc.dg/init-excess-2.c: Require int32plus.
	* gcc.dg/pr44024.c: Skip if target keeps null pointer checks.
	* gcc.dg/pr59963-2.c: Require int32plus.
	* gcc.dg/pr71084.c: Cast pointer to intprt_t.
	* gcc.dg/unroll-7.c: Require int32plus.

From-SVN: r239065
---
 gcc/testsuite/ChangeLog              | 8 ++++++++
 gcc/testsuite/gcc.dg/init-excess-2.c | 1 +
 gcc/testsuite/gcc.dg/pr44024.c       | 1 +
 gcc/testsuite/gcc.dg/pr59963-2.c     | 1 +
 gcc/testsuite/gcc.dg/pr71084.c       | 4 +++-
 gcc/testsuite/gcc.dg/unroll-7.c      | 2 ++
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c1a98ec2e98..4de987dd9d1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2016-08-03  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
+
+	* gcc.dg/init-excess-2.c: Require int32plus.
+	* gcc.dg/pr44024.c: Skip if target keeps null pointer checks.
+	* gcc.dg/pr59963-2.c: Require int32plus.
+	* gcc.dg/pr71084.c: Cast pointer to intprt_t.
+	* gcc.dg/unroll-7.c: Require int32plus.
+
 2016-08-02  Bin Cheng  <bin.cheng@arm.com>
 
 	PR tree-optimization/34114
diff --git a/gcc/testsuite/gcc.dg/init-excess-2.c b/gcc/testsuite/gcc.dg/init-excess-2.c
index 1bf0a96a880..0e91b60950b 100644
--- a/gcc/testsuite/gcc.dg/init-excess-2.c
+++ b/gcc/testsuite/gcc.dg/init-excess-2.c
@@ -3,6 +3,7 @@
    c/71115 - Missing warning: excess elements in struct initializer.  */
 /* { dg-do compile } */
 /* { dg-options "" } */
+/* { dg-require-effective-target int32plus } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/pr44024.c b/gcc/testsuite/gcc.dg/pr44024.c
index 8791a29f420..3bcf4311c74 100644
--- a/gcc/testsuite/gcc.dg/pr44024.c
+++ b/gcc/testsuite/gcc.dg/pr44024.c
@@ -1,5 +1,6 @@
 /* { dg-do link } */
 /* { dg-options "-O1 -fdelete-null-pointer-checks -fdump-tree-ccp1" } */
+/* { dg-skip-if "" keeps_null_pointer_checks } */
 
 void foo();
 void link_error (void);
diff --git a/gcc/testsuite/gcc.dg/pr59963-2.c b/gcc/testsuite/gcc.dg/pr59963-2.c
index 6e0a6d62816..8eb1a796bbc 100644
--- a/gcc/testsuite/gcc.dg/pr59963-2.c
+++ b/gcc/testsuite/gcc.dg/pr59963-2.c
@@ -1,6 +1,7 @@
 /* PR c/59963 */
 /* { dg-do compile } */
 /* { dg-options "-Woverflow -Wconversion" } */
+/* { dg-require-effective-target int32plus } */
 
 extern void bar (unsigned char);
 extern void bar8 (unsigned char, unsigned char, unsigned char, unsigned char,
diff --git a/gcc/testsuite/gcc.dg/pr71084.c b/gcc/testsuite/gcc.dg/pr71084.c
index 46fdf9fbe5c..392c5ca2394 100644
--- a/gcc/testsuite/gcc.dg/pr71084.c
+++ b/gcc/testsuite/gcc.dg/pr71084.c
@@ -2,6 +2,8 @@
 /* { dg-do compile } */
 /* { dg-options "-O2" } */
 
+__extension__ typedef __INTPTR_TYPE__ intptr_t;
+
 void babl_format (void);
 void gimp_drawable_get_format (void);
 int _setjmp (void);
@@ -32,7 +34,7 @@ void fn1 ()
 	gimp_drawable_get_format();
       }
   for (; run_height;)
-    for (; run_i < (long)fn1; ++run_i)
+    for (; run_i < (long)(intptr_t)fn1; ++run_i)
       for (; width;)
         ;
 }
diff --git a/gcc/testsuite/gcc.dg/unroll-7.c b/gcc/testsuite/gcc.dg/unroll-7.c
index e7fa4cf0a8c..70b92ba080f 100644
--- a/gcc/testsuite/gcc.dg/unroll-7.c
+++ b/gcc/testsuite/gcc.dg/unroll-7.c
@@ -1,5 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-rtl-loop2_unroll -funroll-loops" } */
+/* { dg-require-effective-target int32plus } */
+
 int t(int *a)
 {
   int i;
-- 
2.30.2