From 023009d4d1a7471a5b965af6baf2d721e607fe92 Mon Sep 17 00:00:00 2001 From: Georg-Johann Lay Date: Thu, 14 Apr 2011 10:38:17 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 6 ++++ .../gcc.target/avr/torture/trivial.c | 29 ++++++++++--------- gcc/testsuite/gcc.target/avr/trivial.c | 29 ++++++++++--------- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 433faa66b19..a86ead50aa0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-04-14 Georg-Johann Lay + + * gcc.target/avr/trivial.c: Fix line endings. Make PROGMEM + variables const. + * gcc.target/avr/torture/trivial.c: Ditto. + 2011-04-13 Jason Merrill * 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 91163f9226e..f1beecb1ece 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 - -#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 + +#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 91163f9226e..f1beecb1ece 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 - -#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 + +#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; +} -- 2.30.2