diff options
| author | gjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-20 17:38:29 +0000 |
|---|---|---|
| committer | gjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-20 17:38:29 +0000 |
| commit | 199489b23bf390d7f5fcf45fab2a7e694b4b8601 (patch) | |
| tree | 291f5a2d943b5759e1cc8eef7137007097263ba4 | |
| parent | d093bf46f7126783e53a9ff098b7049bad11c1c0 (diff) | |
| download | ppe42-gcc-199489b23bf390d7f5fcf45fab2a7e694b4b8601.tar.gz ppe42-gcc-199489b23bf390d7f5fcf45fab2a7e694b4b8601.zip | |
* gcc.target/avr/progmem.h (pgm_read_char): Define depending on
__AVR_HAVE_LPMX__
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185583 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/avr/progmem.h | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dfdee374764..124ea7234f9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2012-03-20 Georg-Johann Lay <avr@gjlay.de> + * gcc.target/avr/progmem.h (pgm_read_char): Define depending on + __AVR_HAVE_LPMX__ + +2012-03-20 Georg-Johann Lay <avr@gjlay.de> + PR target/49868 * gcc.target/avr/torture/addr-space-2.h: New file. * gcc.target/avr/torture/addr-space-2-g.h: New test. diff --git a/gcc/testsuite/gcc.target/avr/progmem.h b/gcc/testsuite/gcc.target/avr/progmem.h index d5e86c9fe3c..17bb7715374 100644 --- a/gcc/testsuite/gcc.target/avr/progmem.h +++ b/gcc/testsuite/gcc.target/avr/progmem.h @@ -5,6 +5,7 @@ static const char __c[] PROGMEM = (s); \ &__c[0];})) +#ifdef __AVR_HAVE_LPMX__ #define pgm_read_char(addr) \ (__extension__({ \ unsigned int __addr16 = (unsigned int)(addr); \ @@ -12,3 +13,13 @@ __asm__ ("lpm %0, %a1" \ : "=r" (__result) : "z" (__addr16)); \ __result; })) +#else +#define pgm_read_char(addr) \ + (__extension__({ \ + unsigned int __addr16 = (unsigned int)(addr); \ + char __result; \ + __asm__ ("lpm" "\n\t" \ + "mov %0, r0" \ + : "=r" (__result) : "z" (__addr16)); \ + __result; })) +#endif |
