[avr-libc-commit] [2268] Temporarily back out changeset 2257 as it breaks the build, and is

[Joerg Wunsch]

Revision: 2268
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2268
Author:   joerg_wunsch
Date:     2011-12-29 07:54:41 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Temporarily back out changeset 2257 as it breaks the build, and is
thus in the way of preparing the 1.8.0 release.

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-12-29 07:53:03 UTC (rev 2267)
+++ trunk/avr-libc/ChangeLog    2011-12-29 07:54:41 UTC (rev 2268)
@@ -47,12 +47,6 @@
 
 2011-09-26  Eric B. Weddington <address@hidden>
 
-       Partial fix for bug #32945.
-       * common/macros.inc (LPM_R0_ZPLUS_* macros): Replace condition of
-    BIG_CODE with __AVR_HAVE_ELPM__.
-
-2011-09-26  Eric B. Weddington <address@hidden>
-
        Partial fix for bug #33716.
        * include/avr/pgmspace.h: Deprecate typedefs with __progmem__ attribute.
        Document as such.

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