[avr-libc-commit] [2275] Re-apply the commit for changeset 2257, now that 1.8.0 has been

[Joerg Wunsch]

Revision: 2275
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2275
Author:   joerg_wunsch
Date:     2011-12-29 14:22:12 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Re-apply the commit for changeset 2257, now that 1.8.0 has been
released.

NB: this currently breaks the build for AT43USB320 devices.

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/common/macros.inc

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-12-29 14:20:00 UTC (rev 2274)
+++ trunk/avr-libc/ChangeLog    2011-12-29 14:22:12 UTC (rev 2275)
@@ -1,3 +1,10 @@
+2011-09-26  Eric B. Weddington <address@hidden>
+
+       (Patch re-applied after being backed out temporarily.)
+       Partial fix for bug #32945.
+       * common/macros.inc (LPM_R0_ZPLUS_* macros): Replace condition of
+       BIG_CODE with __AVR_HAVE_ELPM__.
+
 2011-12-29  Joerg Wunsch <address@hidden>
 
        * configure.ac: Bump version version for post-release.

Modified: trunk/avr-libc/common/macros.inc
===================================================================
--- trunk/avr-libc/common/macros.inc    2011-12-29 14:20:00 UTC (rev 2274)
+++ trunk/avr-libc/common/macros.inc    2011-12-29 14:22:12 UTC (rev 2275)
@@ -342,7 +342,7 @@
 
        .macro  LPM_R0_ZPLUS_INIT hhi
 #if __AVR_ENHANCED__
-  #if BIG_CODE
+  #if __AVR_HAVE_ELPM__
        out     AVR_RAMPZ_ADDR, \hhi
   #endif
 #endif
@@ -350,7 +350,7 @@
 
        .macro  LPM_R0_ZPLUS_NEXT hhi
 #if __AVR_ENHANCED__
-  #if BIG_CODE
+  #if __AVR_HAVE_ELPM__
     /* ELPM with RAMPZ:Z post-increment, load RAMPZ only once */
        elpm    r0, Z+
   #else
@@ -358,7 +358,7 @@
        lpm     r0, Z+
   #endif
 #else
-  #if BIG_CODE
+  #if __AVR_HAVE_ELPM__
     /* ELPM without post-increment, load RAMPZ each time (ATmega103) */
        out     AVR_RAMPZ_ADDR, \hhi
        elpm