progmem.h (pgm_read_char): Define depending on __AVR_HAVE_LPMX__

	* gcc.target/avr/progmem.h (pgm_read_char): Define depending on
	__AVR_HAVE_LPMX__

From-SVN: r185583

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dfdee37..124ea72 100644 (file)
--- 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 d5e86c9..17bb771 100644 (file)
--- 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