[avr-libc-commit] [2403] bug #36410: avr/boot.h: poisoned SPMCR for ATmega128

[Joerg Wunsch]

Revision: 2403
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2403
Author:   joerg_wunsch
Date:     2013-06-08 08:58:22 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
bug #36410: avr/boot.h: poisoned SPMCR for ATmega128

Don't evaluate SPMCR if SPMCSR was already around.

Ticket Links:
------------
    http://savannah.gnu.org/bugs/?36410

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/avr/boot.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2013-05-23 14:37:09 UTC (rev 2402)
+++ trunk/avr-libc/ChangeLog    2013-06-08 08:58:22 UTC (rev 2403)
@@ -1,3 +1,9 @@
+2013-06-08  Joerg Wunsch <address@hidden>
+
+       bug #36410: avr/boot.h: poisoned SPMCR for ATmega128
+       * include/avr/boot.h: Don't evaluate SPMCR if SPMCSR was
+       already around.
+
 2013-05-13  Joerg Wunsch <address@hidden>
 
        * tests/simulate/other/progtype-3.c (s): Initialize progmem

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2013-05-23 14:37:09 UTC (rev 2402)
+++ trunk/avr-libc/NEWS 2013-06-08 08:58:22 UTC (rev 2403)
@@ -7,6 +7,7 @@
   [#35226] Online-documentation broken - [...]
   [#35398] assert doesn't work unless stdlib.h is also included
   [#35539] stdlib.h does not provide EXIT_SUCCESS et al.
+  [#36410] avr/boot.h: poisoned SPMCR for ATmega128
   [#36454] string.h: Error for long long in C90
   [#36581] avr-libc: pgmspace.h is not ANSI compliant
   [#37778] _MemoryBarrier() in cpufunc.h error on compile

Modified: trunk/avr-libc/include/avr/boot.h
===================================================================
--- trunk/avr-libc/include/avr/boot.h   2013-05-23 14:37:09 UTC (rev 2402)
+++ trunk/avr-libc/include/avr/boot.h   2013-06-08 08:58:22 UTC (rev 2403)
@@ -109,10 +109,12 @@
 /* Check for SPM Control Register in processor. */
 #if defined (SPMCSR)
 #  define __SPM_REG    SPMCSR
-#elif defined (SPMCR)
-#  define __SPM_REG    SPMCR
 #else
-#  error AVR processor does not provide bootloader support!
+#  if defined (SPMCR)
+#    define __SPM_REG    SPMCR
+#  else
+#    error AVR processor does not provide bootloader support!
+#  endif
 #endif