* gcc.target/avr/trivial.c: Fix line endings. Make PROGMEM

	variables const.
	* gcc.target/avr/torture/trivial.c: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172417 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 433faa6..a86ead5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-14  Georg-Johann Lay  <avr@gjlay.de>
+
+       * gcc.target/avr/trivial.c: Fix line endings. Make PROGMEM
+       variables const.
+       * gcc.target/avr/torture/trivial.c: Ditto.
+
 2011-04-13  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/template/operator11.C: New.

diff --git a/gcc/testsuite/gcc.target/avr/torture/trivial.c b/gcc/testsuite/gcc.target/avr/torture/trivial.c
index 91163f9..f1beecb 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/torture/trivial.c
+++ b/gcc/testsuite/gcc.target/avr/torture/trivial.c
@@ -1,14 +1,15 @@
-/* { dg-do run } */\r
-#include <stdio.h>\r
-\r
-#define __ATTR_PROGMEM__ __attribute__((__progmem__))\r
-\r
-#define PROGMEM __ATTR_PROGMEM__\r
-char PROGMEM a1 = 0x12; \r
-int PROGMEM a2 = 0x2345; \r
-long PROGMEM a3 = 0x12345678; \r
-int main(void)\r
-{\r
-  printf("Hello World\n");\r
-  return 0;\r
-}\r
+/* { dg-do run } */
+
+#include <stdio.h>
+
+#define PROGMEM __attribute__((__progmem__))
+
+const char PROGMEM a1 = 0x12; 
+const int PROGMEM a2 = 0x2345; 
+const long PROGMEM a3 = 0x12345678; 
+
+int main(void)
+{
+  printf ("Hello World\n");
+  return 0;
+}

diff --git a/gcc/testsuite/gcc.target/avr/trivial.c b/gcc/testsuite/gcc.target/avr/trivial.c
index 91163f9..f1beecb 100644 (file)
--- a/gcc/testsuite/gcc.target/avr/trivial.c
+++ b/gcc/testsuite/gcc.target/avr/trivial.c
@@ -1,14 +1,15 @@
-/* { dg-do run } */\r
-#include <stdio.h>\r
-\r
-#define __ATTR_PROGMEM__ __attribute__((__progmem__))\r
-\r
-#define PROGMEM __ATTR_PROGMEM__\r
-char PROGMEM a1 = 0x12; \r
-int PROGMEM a2 = 0x2345; \r
-long PROGMEM a3 = 0x12345678; \r
-int main(void)\r
-{\r
-  printf("Hello World\n");\r
-  return 0;\r
-}\r
+/* { dg-do run } */
+
+#include <stdio.h>
+
+#define PROGMEM __attribute__((__progmem__))
+
+const char PROGMEM a1 = 0x12; 
+const int PROGMEM a2 = 0x2345; 
+const long PROGMEM a3 = 0x12345678; 
+
+int main(void)
+{
+  printf ("Hello World\n");
+  return 0;
+}