AVR: Fix some test options. Skip tests with address-space on Reduced Tiny.

gcc/testsuite/
	* gcc.target/avr/lra-cpymem_qi.c: Remove duplicate -mmcu=.
	* gcc.target/avr/lra-elim.c: Same.
	* gcc.target/avr/pr112830.c: Skip for Reduced Tiny.
	* gcc.target/avr/pr46779-1.c: Same.
	* gcc.target/avr/pr46779-2.c: Same.
	* gcc.target/avr/pr86869.c: Skip for Reduced Tiny and add -std=gnu99
	for GNU-C due to address spaces.
	* gcc.target/avr/pr89270.c: Same.
	* gcc.target/avr/torture/builtins-2-flash.c: Only test address
	space __flash1 if we have it.
	* gcc.target/avr/torture/addr-space-1-1.c: Same.
	* gcc.target/avr/torture/addr-space-2-1.c: Same.

diff --git a/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c b/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c
index fdffb445b4546b0673e2bc1d3773f879023fad90..31cf2003c430246f7fea0231b9c435a9604a09b9 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c
+++ b/gcc/testsuite/gcc.target/avr/lra-cpymem_qi.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mmcu=avr51 -Os" } */
+/* { dg-options "-Os" } */
 
 #include <stdbool.h>
 

diff --git a/gcc/testsuite/gcc.target/avr/lra-elim.c b/gcc/testsuite/gcc.target/avr/lra-elim.c
index d5086a7fd5da05928fbd4c85f699d14703db8fab..8d5dbf8ac4e17a5696911085eb4d88cba71a73f8 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/lra-elim.c
+++ b/gcc/testsuite/gcc.target/avr/lra-elim.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mmcu=avr25 -Os" } */
+/* { dg-options "-Os" } */
 
 typedef int HItype __attribute__ ((mode (HI)));
 HItype

diff --git a/gcc/testsuite/gcc.target/avr/pr112830.c b/gcc/testsuite/gcc.target/avr/pr112830.c
index c305daed06c66b327f1c809740d66b1868609b74..dd70dd0ea39149c820c64e7388e3d0446a274b6a 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/pr112830.c
+++ b/gcc/testsuite/gcc.target/avr/pr112830.c
@@ -1,4 +1,4 @@
-/* { dg-do compile } */
+/* { dg-do compile { target { ! avr_tiny } } } */
 /* { dg-options "" } */
 
 typedef __SIZE_TYPE__ size_t;

diff --git a/gcc/testsuite/gcc.target/avr/pr46779-1.c b/gcc/testsuite/gcc.target/avr/pr46779-1.c
index 24522f175bee2feedb13626dd51f67c6702c863a..e3e0b29211482024ae9b03bc5c4c33850e90aa0b 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/pr46779-1.c
+++ b/gcc/testsuite/gcc.target/avr/pr46779-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target { ! avr_tiny } } } */
 /* { dg-options "-Os -fsplit-wide-types" } */
 
 /* This testcase should uncover bugs like

diff --git a/gcc/testsuite/gcc.target/avr/pr46779-2.c b/gcc/testsuite/gcc.target/avr/pr46779-2.c
index 682070b5ef936ce209b8e64893dd0004f016c7c6..557cc749c758a2aaeb82c775218741a8ae531e0e 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/pr46779-2.c
+++ b/gcc/testsuite/gcc.target/avr/pr46779-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target { ! avr_tiny } } } */
 /* { dg-options "-Os -fno-split-wide-types" } */
 
 /* This testcase should uncover bugs like

diff --git a/gcc/testsuite/gcc.target/avr/pr86869.c b/gcc/testsuite/gcc.target/avr/pr86869.c
index fbfb378e8c90967f22b6d864db5e5ede152f9342..a5de4cc65107e7cd5384ca660c0acd92f12c3577 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/pr86869.c
+++ b/gcc/testsuite/gcc.target/avr/pr86869.c
@@ -1,4 +1,5 @@
-/* { dg-do compile } */
+/* { dg-do compile { target { ! avr_tiny } } } */
+/* { dg-additional-options "-std=gnu99 -w" } */
 
 struct S {
   char y[2];

diff --git a/gcc/testsuite/gcc.target/avr/pr89270.c b/gcc/testsuite/gcc.target/avr/pr89270.c
index 2b6e4a8aa5be1cfc861eeabf44bbcedae0950082..5b43218eddbba0f42756b2feed1344fe4e547068 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/pr89270.c
+++ b/gcc/testsuite/gcc.target/avr/pr89270.c
@@ -1,4 +1,5 @@
-/* { dg-do compile } */
+/* { dg-do compile { target { ! avr_tiny } } } */
+/* { dg-additional-options "-std=gnu99" } */
 
 void test()
 {

diff --git a/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c b/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c
index e90bdcb5bfbec0a09eeab8d43012ff6a26e35680..4812f67e2f1864539c989293fbdefb8c5ce486bc 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c
+++ b/gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c
@@ -1,6 +1,10 @@
 /* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */
 /* { dg-do run { target { ! avr_tiny } } } */
 
+#ifdef __FLASH1
 #define __as __flash1
+#else
+#define __as __flash
+#endif
 
 #include "addr-space-1.h"

diff --git a/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c b/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c
index 327124aff27ad4be750048db2eb2c64ad6b70ff1..d5fcf0a5520cf0113966984bff336452c5e2e6b8 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c
+++ b/gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c
@@ -1,6 +1,10 @@
 /* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */
 /* { dg-do run { target { ! avr_tiny } } } */
 
+#ifdef __FLASH1
 #define __as __flash1
+#else
+#define __as __flash
+#endif
 
 #include "addr-space-2.h"

diff --git a/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c b/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c
index 318551d5ccf3d1833f0931708375eae54397f26a..11dba67b85ae7a23c4d1a1780970bab277e1c1dc 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c
+++ b/gcc/testsuite/gcc.target/avr/torture/builtins-2-flash.c
@@ -4,7 +4,9 @@
 #include <stdlib.h>
 
 const __flash char c0 = 1;
+#ifdef __FLASH1
 const __flash1 char c1 = 1;
+#endif
 
 int main (void)
 {
@@ -14,9 +16,11 @@ int main (void)
   if (__builtin_avr_flash_segment (p) != 0)
     abort();
 
+#ifdef __FLASH1
   p = &c1;
   if (__builtin_avr_flash_segment (p) != 1)
     abort();
+#endif
 
   if (__builtin_avr_flash_segment ("p") != -1)
     abort();