libgcc.S: Correct my wrong previous commit.

	* config/avr/libgcc.S : Correct my wrong previous commit.

From-SVN: r114774

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11091f0ff1a911f28367c0ce48ff7cb446baec34..d0303b87ed6e390db152d7eb77b86693e6d09a08 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-19  Denis Chertykov  <denisc@overta.ru>
+
+       * config/avr/libgcc.S : Correct my wrong previous commit.
+
 2006-06-19  Roger Sayle  <roger@eyesopen.com>
 
        PR target/27861

diff --git a/gcc/config/avr/libgcc.S b/gcc/config/avr/libgcc.S
index b5ef3376e0b2ccba75798bd45e587e1f10c2b6dd..d542bc8e3496b9394d613d48d1bbd72b152fd8f1 100644 (file)
--- a/gcc/config/avr/libgcc.S
+++ b/gcc/config/avr/libgcc.S
@@ -40,7 +40,7 @@ Boston, MA 02110-1301, USA.  */
        .section .text.libgcc, "ax", @progbits
 
        .macro  mov_l  r_dest, r_src
-#if defined (__AVR_ENHANCED__)
+#if defined (__AVR_HAVE_MOVW__)
        movw    \r_dest, \r_src
 #else
        mov     \r_dest, \r_src
@@ -48,7 +48,7 @@ Boston, MA 02110-1301, USA.  */
        .endm
 
        .macro  mov_h  r_dest, r_src
-#if defined (__AVR_ENHANCED__)
+#if defined (__AVR_HAVE_MOVW__)
        ; empty
 #else
        mov     \r_dest, \r_src
@@ -276,10 +276,10 @@ __mulsi3_skip1:
        cpc     r_arg1H,r_arg1L
        brne    __mulsi3_loop           ; exit if multiplier = 0
 __mulsi3_exit:
-       mov     r_arg1HH,r_resHH        ; result to return register
-       mov     r_arg1HL,r_resHL
-       mov     r_arg1H,r_resH
-       mov     r_arg1L,r_resL
+       mov_h   r_arg1HH,r_resHH        ; result to return register
+       mov_l   r_arg1HL,r_resHL
+       mov_h   r_arg1H,r_resH
+       mov_l   r_arg1L,r_resL
        ret
 #endif /* !defined (__AVR_ENHANCED__) */
 #undef r_arg1L 
@@ -698,7 +698,7 @@ __do_copy_data:
        ldi     r31, hi8(__data_load_start)
        rjmp    .do_copy_data_start
 .do_copy_data_loop:
-#if defined (__AVR_ENHANCED__)
+#if defined (__AVR_HAVE_LPMX__)
        lpm     r0, Z+
 #else
        lpm