aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg-Johann Lay <avr@gjlay.de>2011-04-14 10:38:17 +0000
committerGeorg-Johann Lay <gjl@gcc.gnu.org>2011-04-14 10:38:17 +0000
commit023009d4d1a7471a5b965af6baf2d721e607fe92 (patch)
treebeaca63e05f11a3adb39150a75255aa679b43fb2
parent43ea65025fe00ea78bbbc2ce7c4b1e8f6e758d9b (diff)
downloadgcc-023009d4d1a7471a5b965af6baf2d721e607fe92.zip
gcc-023009d4d1a7471a5b965af6baf2d721e607fe92.tar.gz
gcc-023009d4d1a7471a5b965af6baf2d721e607fe92.tar.bz2
trivial.c: Fix line endings.
* gcc.target/avr/trivial.c: Fix line endings. Make PROGMEM variables const. * gcc.target/avr/torture/trivial.c: Ditto. From-SVN: r172417
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.target/avr/torture/trivial.c29
-rw-r--r--gcc/testsuite/gcc.target/avr/trivial.c29
3 files changed, 36 insertions, 28 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 433faa6..a86ead5 100644
--- 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
--- 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 } */
-#include <stdio.h>
-
-#define __ATTR_PROGMEM__ __attribute__((__progmem__))
-
-#define PROGMEM __ATTR_PROGMEM__
-char PROGMEM a1 = 0x12;
-int PROGMEM a2 = 0x2345;
-long PROGMEM a3 = 0x12345678;
-int main(void)
-{
- printf("Hello World\n");
- return 0;
-}
+/* { 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
--- a/gcc/testsuite/gcc.target/avr/trivial.c
+++ b/gcc/testsuite/gcc.target/avr/trivial.c
@@ -1,14 +1,15 @@
-/* { dg-do run } */
-#include <stdio.h>
-
-#define __ATTR_PROGMEM__ __attribute__((__progmem__))
-
-#define PROGMEM __ATTR_PROGMEM__
-char PROGMEM a1 = 0x12;
-int PROGMEM a2 = 0x2345;
-long PROGMEM a3 = 0x12345678;
-int main(void)
-{
- printf("Hello World\n");
- return 0;
-}
+/* { 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;
+}