avr-libc-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[avr-libc-dev] FW: [avr-libc-commit] [2191] 2010-11-05 Eric B.


From: Boyapati, Anitha
Subject: [avr-libc-dev] FW: [avr-libc-commit] [2191] 2010-11-05 Eric B.
Date: Tue, 9 Nov 2010 16:56:56 +0800

Hi,


I just saw the committed changes. To avoid the compilation errors, 
!defined(__AVR_TINY__) is included in almost all libc and libm files.

I am not sure if this is already discussed but going forward, when AVR tiny is 
supported in future, should the developer undo these changes? To me this looks 
repetitive and not so modular.

If possible modifying build scripts for Tiny target is a much better 
alternative. Thoughts?

Anitha


-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf Of Eric Weddington
Sent: Friday, November 05, 2010 7:16 PM
To: address@hidden
Subject: [avr-libc-commit] [2191] 2010-11-05 Eric B.

Revision: 2191
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2191
Author:   arcanum
Date:     2010-11-05 13:45:57 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
2010-11-05  Eric B. Weddington  <address@hidden>

        common/asmdef.h: Add conditional compilation to not compile for
        ATiny10 family.
        common/ctoasm.inc: Same.
        libc/misc/eeupd_byte.S: Same.
        libc/misc/itoa.S: Same.
        libc/misc/utoa.S: Same.
        libc/pmstring/memchr_P.S: Same.
        libc/pmstring/memcmp_P.S: Same.
        libc/pmstring/memcmp_PF.S: Same.
        libc/pmstring/memcpy_P.S: Same.
        libc/pmstring/memcpy_PF.S: Same.
        libc/pmstring/memrchr_P.S: Same.
        libc/pmstring/strcasecmp_P.S: Same.
        libc/pmstring/strcasecmp_PF.S: Same.
        libc/pmstring/strcat_P.S: Same.
        libc/pmstring/strcat_PF.S: Same.
        libc/pmstring/strchr_P.S: Same.
        libc/pmstring/strchrnul_P.S: Same.
        libc/pmstring/strcmp_P.S: Same.
        libc/pmstring/strcmp_PF.S: Same.
        libc/pmstring/strcpy_P.S: Same.
        libc/pmstring/strcpy_PF.S: Same.
        libc/pmstring/strcspn_P.S: Same.
        libc/pmstring/strlcat_P.S: Same.
        libc/pmstring/strlcat_PF.S: Same.
        libc/pmstring/strlcpy_P.S: Same.
        libc/pmstring/strlcpy_PF.S: Same.
        libc/pmstring/strlen_P.S: Same.
        libc/pmstring/strlen_PF.S: Same.
        libc/pmstring/strncasecmp_P.S: Same.
        libc/pmstring/strncasecmp_PF.S: Same.
        libc/pmstring/strncat_P.S: Same.
        libc/pmstring/strncat_PF.S: Same.
        libc/pmstring/strncmp_P.S: Same.
        libc/pmstring/strncmp_PF.S: Same.
        libc/pmstring/strncpy_P.S: Same.
        libc/pmstring/strncpy_PF.S: Same.
        libc/pmstring/strnlen_P.S: Same.
        libc/pmstring/strnlen_PF.S: Same.
        libc/pmstring/strpbrk_P.S: Same.
        libc/pmstring/strrchr_P.S: Same.
        libc/pmstring/strsep_P.S: Same.
        libc/pmstring/strspn_P.S: Same.
        libc/pmstring/strstr_P.S: Same.
        libc/pmstring/strstr_PF.S: Same.
        libc/pmstring/strtok_P.c: Same.
        libc/pmstring/strtok_rP.S: Same.
        libc/stdio/fputs_p.c: Same.
        libc/stdio/puts_p.c: Same.
        libc/stdio/ultoa_invert.S: Same.
        libc/stdio/vfprintf.c: Same.
        libc/stdio/vfscanf.c: Same.
        libc/stdlib/ftoa_engine.S: Same.
        libc/stdlib/setjmp.S: Same.
        libc/stdlib/strtod.c: Same.
        libc/string/ffsll.S: Same.
        libc/string/memccpy.S: Same.
        libc/string/memchr.S: Same.
        libc/string/memmem.S: Same.
        libc/string/memrchr.S: Same.
        libc/string/strcasestr.S: Same.
        libc/string/strcat.S: Same.
        libc/string/strchr.S: Same.
        libc/string/strchrnul.S: Same.
        libc/string/strcspn.S: Same.
        libc/string/strlcpy.S: Same.
        libc/string/strncat.S: Same.
        libc/string/strpbrk.S: Same.
        libc/string/strrchr.S: Same.
        libc/string/strrev.S: Same.
        libc/string/strsep.S: Same.
        libc/string/strspn.S: Same.
        libc/string/strstr.S: Same.
        libc/string/strtok_r.S: Same.
        libm/fplib/acos.S: Same.
        libm/fplib/addsf3x.S: Same.
        libm/fplib/asin.S: Same.
        libm/fplib/atan.S: Same.
        libm/fplib/atan2.S: Same.
        libm/fplib/cbrt.S: Same.
        libm/fplib/ceil.S: Same.
        libm/fplib/divsf3x.S: Same.
        libm/fplib/exp.S: Same.
        libm/fplib/fdim.S: Same.
        libm/fplib/fixsfsi.S: Same.
        libm/fplib/floatsisf.S: Same.
        libm/fplib/floatundisf.S: Same.
        libm/fplib/floor.S: Same.
        libm/fplib/fma.S: Same.
        libm/fplib/fmax.S: Same.
        libm/fplib/fmin.S: Same.
        libm/fplib/fmod.S: Same.
        libm/fplib/fp_cmp.S: Same.
        libm/fplib/fp_mpack.S: Same.
        libm/fplib/fp_powser.S: Same.
        libm/fplib/fp_pscA.S: Same.
        libm/fplib/fp_pscB.S: Same.
        libm/fplib/fp_round.S: Same.
        libm/fplib/fp_sinus.S: Same.
        libm/fplib/fp_split3.S: Same.
        libm/fplib/fp_trunc.S: Same.
        libm/fplib/frexp.S: Same.
        libm/fplib/isinf.S: Same.
        libm/fplib/ldexp.S: Same.
        libm/fplib/log.S: Same.
        libm/fplib/lrint.S: Same.
        libm/fplib/lround.S: Same.
        libm/fplib/modf.S: Same.
        libm/fplib/mulsf3x.S: Same.
        libm/fplib/pow.S: Same.
        libm/fplib/round.S: Same.
        libm/fplib/sin.S: Same.
        libm/fplib/sinh.S: Same.
        libm/fplib/sqrt.S: Same.
        libm/fplib/tanh.S: Same.

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/common/asmdef.h
    trunk/avr-libc/common/ctoasm.inc
    trunk/avr-libc/libc/misc/eeupd_byte.S
    trunk/avr-libc/libc/misc/itoa.S
    trunk/avr-libc/libc/misc/utoa.S
    trunk/avr-libc/libc/pmstring/memchr_P.S
    trunk/avr-libc/libc/pmstring/memcmp_P.S
    trunk/avr-libc/libc/pmstring/memcmp_PF.S
    trunk/avr-libc/libc/pmstring/memcpy_P.S
    trunk/avr-libc/libc/pmstring/memcpy_PF.S
    trunk/avr-libc/libc/pmstring/memrchr_P.S
    trunk/avr-libc/libc/pmstring/strcasecmp_P.S
    trunk/avr-libc/libc/pmstring/strcasecmp_PF.S
    trunk/avr-libc/libc/pmstring/strcat_P.S
    trunk/avr-libc/libc/pmstring/strcat_PF.S
    trunk/avr-libc/libc/pmstring/strchr_P.S
    trunk/avr-libc/libc/pmstring/strchrnul_P.S
    trunk/avr-libc/libc/pmstring/strcmp_P.S
    trunk/avr-libc/libc/pmstring/strcmp_PF.S
    trunk/avr-libc/libc/pmstring/strcpy_P.S
    trunk/avr-libc/libc/pmstring/strcpy_PF.S
    trunk/avr-libc/libc/pmstring/strcspn_P.S
    trunk/avr-libc/libc/pmstring/strlcat_P.S
    trunk/avr-libc/libc/pmstring/strlcat_PF.S
    trunk/avr-libc/libc/pmstring/strlcpy_P.S
    trunk/avr-libc/libc/pmstring/strlcpy_PF.S
    trunk/avr-libc/libc/pmstring/strlen_P.S
    trunk/avr-libc/libc/pmstring/strlen_PF.S
    trunk/avr-libc/libc/pmstring/strncasecmp_P.S
    trunk/avr-libc/libc/pmstring/strncasecmp_PF.S
    trunk/avr-libc/libc/pmstring/strncat_P.S
    trunk/avr-libc/libc/pmstring/strncat_PF.S
    trunk/avr-libc/libc/pmstring/strncmp_P.S
    trunk/avr-libc/libc/pmstring/strncmp_PF.S
    trunk/avr-libc/libc/pmstring/strncpy_P.S
    trunk/avr-libc/libc/pmstring/strncpy_PF.S
    trunk/avr-libc/libc/pmstring/strnlen_P.S
    trunk/avr-libc/libc/pmstring/strnlen_PF.S
    trunk/avr-libc/libc/pmstring/strpbrk_P.S
    trunk/avr-libc/libc/pmstring/strrchr_P.S
    trunk/avr-libc/libc/pmstring/strsep_P.S
    trunk/avr-libc/libc/pmstring/strspn_P.S
    trunk/avr-libc/libc/pmstring/strstr_P.S
    trunk/avr-libc/libc/pmstring/strstr_PF.S
    trunk/avr-libc/libc/pmstring/strtok_P.c
    trunk/avr-libc/libc/pmstring/strtok_rP.S
    trunk/avr-libc/libc/stdio/fputs_p.c
    trunk/avr-libc/libc/stdio/puts_p.c
    trunk/avr-libc/libc/stdio/ultoa_invert.S
    trunk/avr-libc/libc/stdio/vfprintf.c
    trunk/avr-libc/libc/stdio/vfscanf.c
    trunk/avr-libc/libc/stdlib/ftoa_engine.S
    trunk/avr-libc/libc/stdlib/setjmp.S
    trunk/avr-libc/libc/stdlib/strtod.c
    trunk/avr-libc/libc/string/ffsll.S
    trunk/avr-libc/libc/string/memccpy.S
    trunk/avr-libc/libc/string/memchr.S
    trunk/avr-libc/libc/string/memmem.S
    trunk/avr-libc/libc/string/memrchr.S
    trunk/avr-libc/libc/string/strcasestr.S
    trunk/avr-libc/libc/string/strcat.S
    trunk/avr-libc/libc/string/strchr.S
    trunk/avr-libc/libc/string/strchrnul.S
    trunk/avr-libc/libc/string/strcspn.S
    trunk/avr-libc/libc/string/strlcpy.S
    trunk/avr-libc/libc/string/strncat.S
    trunk/avr-libc/libc/string/strpbrk.S
    trunk/avr-libc/libc/string/strrchr.S
    trunk/avr-libc/libc/string/strrev.S
    trunk/avr-libc/libc/string/strsep.S
    trunk/avr-libc/libc/string/strspn.S
    trunk/avr-libc/libc/string/strstr.S
    trunk/avr-libc/libc/string/strtok_r.S
    trunk/avr-libc/libm/fplib/acos.S
    trunk/avr-libc/libm/fplib/addsf3x.S
    trunk/avr-libc/libm/fplib/asin.S
    trunk/avr-libc/libm/fplib/atan.S
    trunk/avr-libc/libm/fplib/atan2.S
    trunk/avr-libc/libm/fplib/cbrt.S
    trunk/avr-libc/libm/fplib/ceil.S
    trunk/avr-libc/libm/fplib/divsf3x.S
    trunk/avr-libc/libm/fplib/exp.S
    trunk/avr-libc/libm/fplib/fdim.S
    trunk/avr-libc/libm/fplib/fixsfsi.S
    trunk/avr-libc/libm/fplib/floatsisf.S
    trunk/avr-libc/libm/fplib/floatundisf.S
    trunk/avr-libc/libm/fplib/floor.S
    trunk/avr-libc/libm/fplib/fma.S
    trunk/avr-libc/libm/fplib/fmax.S
    trunk/avr-libc/libm/fplib/fmin.S
    trunk/avr-libc/libm/fplib/fmod.S
    trunk/avr-libc/libm/fplib/fp_cmp.S
    trunk/avr-libc/libm/fplib/fp_mpack.S
    trunk/avr-libc/libm/fplib/fp_powser.S
    trunk/avr-libc/libm/fplib/fp_pscA.S
    trunk/avr-libc/libm/fplib/fp_pscB.S
    trunk/avr-libc/libm/fplib/fp_round.S
    trunk/avr-libc/libm/fplib/fp_sinus.S
    trunk/avr-libc/libm/fplib/fp_split3.S
    trunk/avr-libc/libm/fplib/fp_trunc.S
    trunk/avr-libc/libm/fplib/frexp.S
    trunk/avr-libc/libm/fplib/isinf.S
    trunk/avr-libc/libm/fplib/ldexp.S
    trunk/avr-libc/libm/fplib/log.S
    trunk/avr-libc/libm/fplib/lrint.S
    trunk/avr-libc/libm/fplib/lround.S
    trunk/avr-libc/libm/fplib/modf.S
    trunk/avr-libc/libm/fplib/mulsf3x.S
    trunk/avr-libc/libm/fplib/pow.S
    trunk/avr-libc/libm/fplib/round.S
    trunk/avr-libc/libm/fplib/sin.S
    trunk/avr-libc/libm/fplib/sinh.S
    trunk/avr-libc/libm/fplib/sqrt.S
    trunk/avr-libc/libm/fplib/tanh.S

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/ChangeLog    2010-11-05 13:45:57 UTC (rev 2191)
@@ -1,3 +1,121 @@
+2010-11-05  Eric B. Weddington  <address@hidden>
+
+       common/asmdef.h: Add conditional compilation to not compile for
+       ATiny10 family.
+       common/ctoasm.inc: Same.
+       libc/misc/eeupd_byte.S: Same.
+       libc/misc/itoa.S: Same.
+       libc/misc/utoa.S: Same.
+       libc/pmstring/memchr_P.S: Same.
+       libc/pmstring/memcmp_P.S: Same.
+       libc/pmstring/memcmp_PF.S: Same.
+       libc/pmstring/memcpy_P.S: Same.
+       libc/pmstring/memcpy_PF.S: Same.
+       libc/pmstring/memrchr_P.S: Same.
+       libc/pmstring/strcasecmp_P.S: Same.
+       libc/pmstring/strcasecmp_PF.S: Same.
+       libc/pmstring/strcat_P.S: Same.
+       libc/pmstring/strcat_PF.S: Same.
+       libc/pmstring/strchr_P.S: Same.
+       libc/pmstring/strchrnul_P.S: Same.
+       libc/pmstring/strcmp_P.S: Same.
+       libc/pmstring/strcmp_PF.S: Same.
+       libc/pmstring/strcpy_P.S: Same.
+       libc/pmstring/strcpy_PF.S: Same.
+       libc/pmstring/strcspn_P.S: Same.
+       libc/pmstring/strlcat_P.S: Same.
+       libc/pmstring/strlcat_PF.S: Same.
+       libc/pmstring/strlcpy_P.S: Same.
+       libc/pmstring/strlcpy_PF.S: Same.
+       libc/pmstring/strlen_P.S: Same.
+       libc/pmstring/strlen_PF.S: Same.
+       libc/pmstring/strncasecmp_P.S: Same.
+       libc/pmstring/strncasecmp_PF.S: Same.
+       libc/pmstring/strncat_P.S: Same.
+       libc/pmstring/strncat_PF.S: Same.
+       libc/pmstring/strncmp_P.S: Same.
+       libc/pmstring/strncmp_PF.S: Same.
+       libc/pmstring/strncpy_P.S: Same.
+       libc/pmstring/strncpy_PF.S: Same.
+       libc/pmstring/strnlen_P.S: Same.
+       libc/pmstring/strnlen_PF.S: Same.
+       libc/pmstring/strpbrk_P.S: Same.
+       libc/pmstring/strrchr_P.S: Same.
+       libc/pmstring/strsep_P.S: Same.
+       libc/pmstring/strspn_P.S: Same.
+       libc/pmstring/strstr_P.S: Same.
+       libc/pmstring/strstr_PF.S: Same.
+       libc/pmstring/strtok_P.c: Same.
+       libc/pmstring/strtok_rP.S: Same.
+       libc/stdio/fputs_p.c: Same.
+       libc/stdio/puts_p.c: Same.
+       libc/stdio/ultoa_invert.S: Same.
+       libc/stdio/vfprintf.c: Same.
+       libc/stdio/vfscanf.c: Same.
+       libc/stdlib/ftoa_engine.S: Same.
+       libc/stdlib/setjmp.S: Same.
+       libc/stdlib/strtod.c: Same.
+       libc/string/ffsll.S: Same.
+       libc/string/memccpy.S: Same.
+       libc/string/memchr.S: Same.
+       libc/string/memmem.S: Same.
+       libc/string/memrchr.S: Same.
+       libc/string/strcasestr.S: Same.
+       libc/string/strcat.S: Same.
+       libc/string/strchr.S: Same.
+       libc/string/strchrnul.S: Same.
+       libc/string/strcspn.S: Same.
+       libc/string/strlcpy.S: Same.
+       libc/string/strncat.S: Same.
+       libc/string/strpbrk.S: Same.
+       libc/string/strrchr.S: Same.
+       libc/string/strrev.S: Same.
+       libc/string/strsep.S: Same.
+       libc/string/strspn.S: Same.
+       libc/string/strstr.S: Same.
+       libc/string/strtok_r.S: Same.
+       libm/fplib/acos.S: Same.
+       libm/fplib/addsf3x.S: Same.
+       libm/fplib/asin.S: Same.
+       libm/fplib/atan.S: Same.
+       libm/fplib/atan2.S: Same.
+       libm/fplib/cbrt.S: Same.
+       libm/fplib/ceil.S: Same.
+       libm/fplib/divsf3x.S: Same.
+       libm/fplib/exp.S: Same.
+       libm/fplib/fdim.S: Same.
+       libm/fplib/fixsfsi.S: Same.
+       libm/fplib/floatsisf.S: Same.
+       libm/fplib/floatundisf.S: Same.
+       libm/fplib/floor.S: Same.
+       libm/fplib/fma.S: Same.
+       libm/fplib/fmax.S: Same.
+       libm/fplib/fmin.S: Same.
+       libm/fplib/fmod.S: Same.
+       libm/fplib/fp_cmp.S: Same.
+       libm/fplib/fp_mpack.S: Same.
+       libm/fplib/fp_powser.S: Same.
+       libm/fplib/fp_pscA.S: Same.
+       libm/fplib/fp_pscB.S: Same.
+       libm/fplib/fp_round.S: Same.
+       libm/fplib/fp_sinus.S: Same.
+       libm/fplib/fp_split3.S: Same.
+       libm/fplib/fp_trunc.S: Same.
+       libm/fplib/frexp.S: Same.
+       libm/fplib/isinf.S: Same.
+       libm/fplib/ldexp.S: Same.
+       libm/fplib/log.S: Same.
+       libm/fplib/lrint.S: Same.
+       libm/fplib/lround.S: Same.
+       libm/fplib/modf.S: Same.
+       libm/fplib/mulsf3x.S: Same.
+       libm/fplib/pow.S: Same.
+       libm/fplib/round.S: Same.
+       libm/fplib/sin.S: Same.
+       libm/fplib/sinh.S: Same.
+       libm/fplib/sqrt.S: Same.
+       libm/fplib/tanh.S: Same.
+
 2010-10-26  Anitha Boyapati  <address@hidden>
 
        Thanks to Eric Weddington for the patch.

Modified: trunk/avr-libc/common/asmdef.h
===================================================================
--- trunk/avr-libc/common/asmdef.h      2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/common/asmdef.h      2010-11-05 13:45:57 UTC (rev 2191)
@@ -55,9 +55,23 @@
    Let us save it, as one is usefull to find externals quickly.        */
 #define        _U(name)        name
 
-#define __tmp_reg__    r0
-#define __zero_reg__   r1
+#if !defined(__tmp_reg__)
+    #if defined(__AVR_TINY__)
+        #define __tmp_reg__ r16
+    #else
+        #define __tmp_reg__ r0
+    #endif
+#endif
 
+#if !defined(__zero_reg__)
+    #if defined(__AVR_TINY__)
+        #define __zero_reg__ r17
+    #else
+        #define __zero_reg__ r1
+    #endif
+#endif
+
+
 #define        XL      r26
 #define        XH      r27
 #define        YL      r28

Modified: trunk/avr-libc/common/ctoasm.inc
===================================================================
--- trunk/avr-libc/common/ctoasm.inc    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/common/ctoasm.inc    2010-11-05 13:45:57 UTC (rev 2191)
@@ -48,16 +48,28 @@
 
 #define rByte    r24   /* a function returning a byte passes this as if it was
                           an integer in R25:R24, but R25 is unused */
-/* temporary registers, usable without saving,
+
+/* Temporary registers, usable without saving,
    maybe clobbered after an external function call */
-#ifndef __tmp_reg__
-#define __tmp_reg__     r0
+#if !defined(__tmp_reg__)
+    #if defined(__AVR_TINY__)
+        #define __tmp_reg__ r16
+    #else
+        #define __tmp_reg__ r0
+    #endif
 #endif
-/* r1 MUST be cleared on return */
-#ifndef __zero_reg__
-#define __zero_reg__    r1
+
+/* The zero constant register MUST be cleared on return. */
+#if !defined(__zero_reg__)
+    #if defined(__AVR_TINY__)
+        #define __zero_reg__ r17
+    #else
+        #define __zero_reg__ r1
+    #endif
 #endif
 
+
+
 #define rTI0     r31  /* 1st temporary with immidiate */
 #define rTI1     r30  /* 2nd temporary with immidiate */
 #define rTI2     r27  /* 3rd temporary with immidiate */

Modified: trunk/avr-libc/libc/misc/eeupd_byte.S
===================================================================
--- trunk/avr-libc/libc/misc/eeupd_byte.S       2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/misc/eeupd_byte.S       2010-11-05 13:45:57 UTC (rev 
2191)
@@ -28,6 +28,8 @@
 
 /* $Id$        */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN
 
 #include <avr/io.h>
@@ -105,4 +107,7 @@
 ENDFUNC
 
 #endif /* E2END && __AVR_ARCH__ > 1 */
+
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/misc/itoa.S
===================================================================
--- trunk/avr-libc/libc/misc/itoa.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/misc/itoa.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -41,6 +41,8 @@
   ----------------------------------------------------------------------
 */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -103,3 +105,5 @@
        .endfunc
 
 #endif /* not __DOXYGEN__ */
+
+#endif /*!defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/misc/utoa.S
===================================================================
--- trunk/avr-libc/libc/misc/utoa.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/misc/utoa.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -41,6 +41,8 @@
   ----------------------------------------------------------------------
 */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -94,3 +96,4 @@
 
 #endif /* not __DOXYGEN__ */
 
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memchr_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memchr_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memchr_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -43,6 +43,8 @@
     byte or \c NULL if the character does not occur in the given memory
     area.      */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -96,3 +98,5 @@
 
        .size   _U(memchr_P), . - _U(memchr_P)
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memcmp_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memcmp_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memcmp_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -44,6 +44,8 @@
     respectively, to be less than, to match, or be greater than the first
     \p len bytes of \p s2.     */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -81,3 +83,5 @@
        .size   _U(memcmp_P), . - _U(memcmp_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memcmp_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memcmp_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memcmp_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -52,6 +52,9 @@
     respectively, to be less than, to match, or be greater than the first
     \p len bytes of \p s2.  */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -101,3 +104,5 @@
   .size _U(memcmp_PF), . - _U(memcmp_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memcpy_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memcpy_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memcpy_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -37,6 +37,9 @@
 
     \returns The memcpy_P() function returns a pointer to dest.  */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -85,3 +88,5 @@
        .size   _U(memcpy_P), .L_memcpy_P_end - _U(memcpy_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memcpy_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memcpy_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memcpy_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define dest_b1 r25
@@ -117,3 +119,5 @@
        .size   _U(memcpy_PF), .L_memcpy_PF_end - _U(memcpy_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/memrchr_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/memrchr_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/memrchr_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,8 @@
     byte or \c NULL if the character does not occur in the given memory
     area.      */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -73,3 +75,5 @@
 ENDFUNC
 
 #endif /* not __DOXYGEN__ */
+
+#endif /*!defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcasecmp_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcasecmp_P.S 2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcasecmp_P.S 2010-11-05 13:45:57 UTC (rev 
2191)
@@ -54,6 +54,9 @@
     the ordering used by strcasecmp_P() is that if \p s1 is an initial
     substring of \p s2, then \p s1 is considered to be "less than" \p s2. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -99,3 +102,5 @@
        .size   _U(strcasecmp_P), . - _U(strcasecmp_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcasecmp_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcasecmp_PF.S        2010-10-26 14:06:17 UTC 
(rev 2190)
+++ trunk/avr-libc/libc/pmstring/strcasecmp_PF.S        2010-11-05 13:45:57 UTC 
(rev 2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define s1_b1 r25
@@ -106,3 +108,5 @@
        .size   _U(strcasecmp_PF), .L_strcasecmp_PF_end - _U(strcasecmp_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif !defined(__AVR_TINY__)

Modified: trunk/avr-libc/libc/pmstring/strcat_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcat_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcat_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -45,6 +45,9 @@
     \returns The strcat() function returns a pointer to the resulting string
     \e dest. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -76,3 +79,5 @@
        .size   _U(strcat_P), .L_strcat_P_end - _U(strcat_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcat_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcat_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcat_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -33,6 +33,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define dest_b1 r25
@@ -92,3 +94,5 @@
        .size   _U(strcat_PF), .L_strcat_PF_end - _U(strcat_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strchr_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strchr_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strchr_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -46,6 +46,9 @@
     \returns The strchr_P() function returns a pointer to the matched
     character or \c NULL if the character is not found. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -79,3 +82,5 @@
        .size   _U(strchr_P), . - _U(strchr_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strchrnul_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strchrnul_P.S  2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strchrnul_P.S  2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,8 @@
     character, or a pointer to the null byte at the end of \p s (i.e.,
     \c s+strlen(s)) if the character is not found.     */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -61,4 +63,7 @@
        X_movw  ret_lo, ZL
        ret
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcmp_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcmp_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcmp_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -42,6 +42,8 @@
     ordering used by strcmp_P() is that if \p s1 is an initial substring
     of \p s2, then \p s1 is considered to be "less than" \p s2. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -73,3 +75,5 @@
        .size   _U(strcmp_P), .L_strcmp_P_end - _U(strcmp_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcmp_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcmp_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcmp_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define s1_b1 r25
@@ -91,3 +93,5 @@
        .size   _U(strcmp_PF), .L_strcmp_PF_end - _U(strcmp_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcpy_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcpy_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcpy_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -38,6 +38,9 @@
     \returns The strcpy_P() function returns a pointer to the destination
     string dest. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -66,3 +69,5 @@
        .size   _U(strcpy_P), .L_strcpy_P_end - _U(strcpy_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcpy_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcpy_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcpy_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define dest_b1 r25
@@ -83,3 +85,5 @@
        .size   _U(strcpy_PF), .L_strcpy_PF_end - _U(strcpy_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strcspn_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcspn_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strcspn_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -41,6 +41,8 @@
     the initial segment of \p s which are not in the string \p reject.
     The terminating zero is not considered as a part of string.        */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -79,3 +81,5 @@
 
        .size _U(strcspn_P), . - _U(strcspn_P)
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlcat_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlcat_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlcat_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -52,6 +52,9 @@
     \returns The strlcat_P() function returns strlen(src) + MIN(siz,
     strlen(initial dst)).  If retval >= siz, truncation occurred.      */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -128,4 +131,7 @@
        ret
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlcat_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlcat_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlcat_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -54,6 +54,8 @@
     strlen(initial \e dst)).  If retval >= \e n, truncation occurred. The
     contents of RAMPZ SFR are undefined when the funcion returns */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -150,3 +152,5 @@
        .size   _U(strlcat_PF), .L_strlcat_PF_end - _U(strlcat_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlcpy_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlcpy_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlcpy_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -49,6 +49,8 @@
     \returns The strlcpy_P() function returns strlen(src). If
     retval >= siz, truncation occurred.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -92,4 +94,7 @@
        rjmp    2b
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlcpy_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlcpy_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlcpy_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -45,6 +45,8 @@
     truncation occurred.  The contents of RAMPZ SFR are undefined when the
     function returns */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -105,3 +107,5 @@
        .size   _U(strlcpy_PF), .L_strlcpy_PF_end - _U(strlcpy_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlen_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlen_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlen_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -37,6 +37,8 @@
 
     \returns The strlen() function returns the number of characters in src. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -65,3 +67,5 @@
        .size   _U(strlen_P), .L_strlen_P_end - _U(strlen_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strlen_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strlen_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strlen_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define src_b3 r25     /* MSB, ignored */
@@ -82,3 +84,5 @@
        .size   _U(strlen_PF), .L_strlen_PF_end - _U(strlen_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncasecmp_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncasecmp_P.S        2010-10-26 14:06:17 UTC 
(rev 2190)
+++ trunk/avr-libc/libc/pmstring/strncasecmp_P.S        2010-11-05 13:45:57 UTC 
(rev 2191)
@@ -56,6 +56,9 @@
     strncasecmp_P() is that if \p s1 is an initial substring of \p s2,
     then \p s1 is considered to be "less than" \p s2.  */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -108,3 +111,5 @@
        .size   _U(strncasecmp_P), . - _U(strncasecmp_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncasecmp_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncasecmp_PF.S       2010-10-26 14:06:17 UTC 
(rev 2190)
+++ trunk/avr-libc/libc/pmstring/strncasecmp_PF.S       2010-11-05 13:45:57 UTC 
(rev 2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define s1_b1 r25
@@ -117,3 +119,5 @@
        .size   _U(strncasecmp_PF), .L_strncasecmp_PF_end - _U(strncasecmp_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncat_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncat_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncat_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,8 @@
     \returns The strncat_P() function returns a pointer to the resulting string
     dest.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -81,3 +83,5 @@
        .size   _U(strncat_P), .L_strncat_P_end - _U(strncat_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncat_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncat_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncat_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -34,6 +34,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define dest_b1 r25
@@ -107,3 +109,5 @@
        .size   _U(strncat_PF), .L_strncat_PF_end - _U(strncat_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncmp_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncmp_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncmp_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -39,6 +39,8 @@
     or greater than zero if s1 (or the first n bytes thereof) is found,
     respectively, to be less than, to match, or be greater than s2.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -79,3 +81,5 @@
        .size   _U(strncmp_P), .L_strncmp_P_end - _U(strncmp_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncmp_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncmp_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncmp_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define s1_b1 r25
@@ -101,3 +103,5 @@
        .size   _U(strncmp_PF), .L_strncmp_PF_end - _U(strncmp_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncpy_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncpy_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncpy_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -43,6 +43,9 @@
     \returns The strncpy_P() function returns a pointer to the destination
     string dest.  */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -85,3 +88,5 @@
        .size   _U(strncpy_P), .L_strncpy_P_end - _U(strncpy_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strncpy_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strncpy_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strncpy_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define dest_b1 r25
@@ -111,3 +113,5 @@
        .size   _U(strncpy_PF), .L_strncpy_PF_end - _U(strncpy_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strnlen_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strnlen_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strnlen_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -44,6 +44,9 @@
     \c len, or \c len if there is no '\\0' character among the first \c len
     characters pointed to by \c src. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -75,3 +78,5 @@
        .size   _U(strnlen_P), .L_strnlen_P_end - _U(strnlen_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strnlen_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strnlen_PF.S   2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strnlen_PF.S   2010-11-05 13:45:57 UTC (rev 
2191)
@@ -35,6 +35,9 @@
 
 /* $Id$ */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "macros.inc"
 
 #define src_b3 r25
@@ -93,3 +96,5 @@
        .size   _U(strnlen_PF), .L_strnlen_PF_end - _U(strnlen_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strpbrk_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strpbrk_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strpbrk_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -43,6 +43,9 @@
     as a part of string: if one or both args are empty, the result will
     \c NULL.   */
 
+
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -81,3 +84,5 @@
 
        .size _U(strpbrk_P), . - _U(strpbrk_P)
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strrchr_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strrchr_P.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strrchr_P.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,9 @@
     \return The strrchr_P() function returns a pointer to the matched
     character or \c NULL if the character is not found. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -70,4 +73,7 @@
        ret
 
        .size   _U(strrchr_P), . - _U(strrchr_P)
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strsep_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strsep_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strsep_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -52,6 +52,9 @@
     value of \p *sp. If \p *sp is initially \c NULL, strsep_P() returns
     \c NULL.   */
      
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -100,3 +103,5 @@
 
        .size   _U(strsep_P), . - _U(strsep_P)
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strspn_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strspn_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strspn_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -41,6 +41,9 @@
     the initial segment of \p s which consist only of characters from \p
     accept. The terminating zero is not considered as a part of string.        
*/
 
+
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -82,3 +85,5 @@
 
        .size _U(strspn_P), . - _U(strspn_P)
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strstr_P.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strstr_P.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strstr_P.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -56,6 +56,9 @@
     of the substring, or NULL if the substring is not found. If \p s2
     points to a string of zero length, the function returns \p s1. */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -113,3 +116,5 @@
 .size _U(strstr_P), . - _U(strstr_P)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strstr_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strstr_PF.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strstr_PF.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -50,6 +50,8 @@
     If \c s2 points to a string of zero length, the function returns \c s1. The
     contents of RAMPZ SFR are undefined when the function returns */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #define s1_b1 r25
@@ -122,3 +124,5 @@
        .size _U(strstr_PF), .L_strstr_end_P - _U(strstr_PF)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strtok_P.c
===================================================================
--- trunk/avr-libc/libc/pmstring/strtok_P.c     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strtok_P.c     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -28,6 +28,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 /** \file */
 
 #include <avr/pgmspace.h>
@@ -52,6 +54,7 @@
     \note strtok_P() is NOT reentrant. For a reentrant version of this
     function see strtok_rP().
  */
+ 
 ATTRIBUTE_CLIB_SECTION
 char *
 strtok_P (char *s, PGM_P delim)
@@ -59,3 +62,5 @@
     static char *p;
     return strtok_rP (s, delim, &p);
 }
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/pmstring/strtok_rP.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strtok_rP.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/pmstring/strtok_rP.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -50,6 +50,8 @@
     \returns The strtok_rP() function returns a pointer to the next token or
     NULL when no more tokens are found. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -229,4 +231,7 @@
 #endif /* !__AVR_HAVE_LPMX__ */
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdio/fputs_p.c
===================================================================
--- trunk/avr-libc/libc/stdio/fputs_p.c 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/stdio/fputs_p.c 2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include <stdio.h>
 #include <avr/pgmspace.h>
 #include "sectionname.h"
@@ -56,3 +58,5 @@
 
        return rv;
 }
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdio/puts_p.c
===================================================================
--- trunk/avr-libc/libc/stdio/puts_p.c  2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/stdio/puts_p.c  2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include <stdio.h>
 #include <avr/pgmspace.h>
 #include "sectionname.h"
@@ -58,3 +60,5 @@
 
        return rv;
 }
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdio/ultoa_invert.S
===================================================================
--- trunk/avr-libc/libc/stdio/ultoa_invert.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/stdio/ultoa_invert.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -28,6 +28,8 @@
 
 /* $Id$        */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -214,3 +216,5 @@
        .end
 
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdio/vfprintf.c
===================================================================
--- trunk/avr-libc/libc/stdio/vfprintf.c        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/stdio/vfprintf.c        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -33,6 +33,8 @@
 /* From: Id: printf_p_new.c,v 1.1.1.9 2002/10/15 20:10:28 joerg_wunsch Exp */
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include <avr/pgmspace.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -711,4 +713,7 @@
   ret:
     return stream->len;
 }
+
 #endif /* PRINTF_LEVEL > PRINTF_MIN */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdio/vfscanf.c
===================================================================
--- trunk/avr-libc/libc/stdio/vfscanf.c 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/stdio/vfscanf.c 2010-11-05 13:45:57 UTC (rev 2191)
@@ -32,6 +32,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include <avr/pgmspace.h>
 #include <ctype.h>
 #include <limits.h>
@@ -880,3 +882,5 @@
   eof:
     return nconvs ? nconvs : EOF;
 }
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdlib/ftoa_engine.S
===================================================================
--- trunk/avr-libc/libc/stdlib/ftoa_engine.S    2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/stdlib/ftoa_engine.S    2010-11-05 13:45:57 UTC (rev 
2191)
@@ -28,6 +28,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -530,3 +532,5 @@
 
        .end
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdlib/setjmp.S
===================================================================
--- trunk/avr-libc/libc/stdlib/setjmp.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/stdlib/setjmp.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,10 @@
 
 /* $Id$ */
 
+
+#if !defined(__AVR_TINY__)
+
+
 /*
    setjmp.S
 
@@ -165,3 +169,5 @@
        .size   _U(longjmp), . - _U(longjmp)
 
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/stdlib/strtod.c
===================================================================
--- trunk/avr-libc/libc/stdlib/strtod.c 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/stdlib/strtod.c 2010-11-05 13:45:57 UTC (rev 2191)
@@ -30,6 +30,10 @@
 
 /* $Id$ */
 
+
+#if !defined(__AVR_TINY__)
+
+
 #include <avr/pgmspace.h>
 #include <ctype.h>
 #include <errno.h>
@@ -219,3 +223,5 @@
 
     return x.flt;
 }
+
+#endif

Modified: trunk/avr-libc/libc/string/ffsll.S
===================================================================
--- trunk/avr-libc/libc/string/ffsll.S  2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/ffsll.S  2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 /** \file */
 
 /** \ingroup avr_string
@@ -88,4 +90,7 @@
        
     .size  _U(ffsll), . - _U(ffsll)
     .end
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/memccpy.S
===================================================================
--- trunk/avr-libc/libc/string/memccpy.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/memccpy.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -63,7 +63,7 @@
 #define ret_hi r25
 #define ret_lo r24
 
-#ifdef Lprogmem
+#if defined(Lprogmem) && !defined(__AVR_TINY__)
 # define memccpy    memccpy_P
 # define LOAD      X_lpm
 #else

Modified: trunk/avr-libc/libc/string/memchr.S
===================================================================
--- trunk/avr-libc/libc/string/memchr.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/memchr.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -40,6 +40,8 @@
     \returns The memchr() function returns a pointer to the matching byte or
     NULL if the character does not occur in the given memory area.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -77,3 +79,5 @@
        .size   _U(memchr), .L_memchr_end - _U(memchr)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/memmem.S
===================================================================
--- trunk/avr-libc/libc/string/memmem.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/memmem.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -47,6 +47,7 @@
     The memmem_P() function is similar to memmem() except that \p s2 is
     pointer to a string in program space.      */
 
+#if !defined(__AVR_TINY__)
 
 #if !defined(__DOXYGEN__)
 
@@ -124,4 +125,7 @@
        ret
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/memrchr.S
===================================================================
--- trunk/avr-libc/libc/string/memrchr.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/memrchr.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,8 @@
     byte or \c NULL if the character does not occur in the given memory
     area.      */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -72,3 +74,5 @@
 ENDFUNC
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strcasestr.S
===================================================================
--- trunk/avr-libc/libc/string/strcasestr.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strcasestr.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -48,6 +48,8 @@
     This funtion is similar to strcasestr() except that \p s2 is pointer
     to a string in program space.      */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -133,4 +135,7 @@
 1:     ret
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strcat.S
===================================================================
--- trunk/avr-libc/libc/string/strcat.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strcat.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -41,6 +41,8 @@
     \returns The strcat() function returns a pointer to the resulting string
     dest.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -72,3 +74,5 @@
        .size   _U(strcat), .L_strcat_end - _U(strcat)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strchr.S
===================================================================
--- trunk/avr-libc/libc/string/strchr.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strchr.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -43,6 +43,8 @@
     \returns The strchr() function returns a pointer to the matched
     character or \c NULL if the character is not found. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -77,3 +79,5 @@
        .size   _U(strchr), .L_strchr_end - _U(strchr)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strchrnul.S
===================================================================
--- trunk/avr-libc/libc/string/strchrnul.S      2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strchrnul.S      2010-11-05 13:45:57 UTC (rev 
2191)
@@ -40,6 +40,8 @@
     character, or a pointer to the null byte at the end of \p s (i.e.,
     \c s+strlen(s)) if the character is not found.     */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -61,4 +63,7 @@
        X_movw  ret_lo, ZL
        ret
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strcspn.S
===================================================================
--- trunk/avr-libc/libc/string/strcspn.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strcspn.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -39,6 +39,8 @@
     the initial segment of \p s which are not in the string \p reject.
     The terminating zero is not considered as a part of string.        */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -76,4 +78,7 @@
        ret
 
        .size _U(strcspn), . - _U(strcspn)
+
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strlcpy.S
===================================================================
--- trunk/avr-libc/libc/string/strlcpy.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strlcpy.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -47,6 +47,9 @@
     \returns The strlcpy() function returns strlen(src). If retval >= siz,
     truncation occurred.  */
 
+
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -90,4 +93,7 @@
        rjmp    2b
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strncat.S
===================================================================
--- trunk/avr-libc/libc/string/strncat.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strncat.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -39,6 +39,8 @@
     \returns The strncat() function returns a pointer to the resulting string
     dest.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -79,3 +81,5 @@
        .size   _U(strncat), .L_strncat_end - _U(strncat)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strpbrk.S
===================================================================
--- trunk/avr-libc/libc/string/strpbrk.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strpbrk.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -41,6 +41,8 @@
     considered as a part of string: if one or both args are empty, the
     result will \c NULL.       */
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -78,4 +80,7 @@
 3:     ret
 
        .size _U(strpbrk), . - _U(strpbrk)
+
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strrchr.S
===================================================================
--- trunk/avr-libc/libc/string/strrchr.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strrchr.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -42,6 +42,8 @@
     \returns The strrchr() function returns a pointer to the matched character
     or NULL if the character is not found. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -75,3 +77,5 @@
        .size   _U(strrchr), .L_strrchr_end - _U(strrchr)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strrev.S
===================================================================
--- trunk/avr-libc/libc/string/strrev.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strrev.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -47,6 +47,8 @@
     \returns The strrev() function returns a pointer to the beginning of the
     reversed string.  */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -84,3 +86,5 @@
     .size _U(strrev), . - _U(strrev)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strsep.S
===================================================================
--- trunk/avr-libc/libc/string/strsep.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strsep.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -48,6 +48,8 @@
     value of \p *sp. If \p *sp is initially \c NULL, strsep() returns
     \c NULL.   */
      
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -95,4 +97,7 @@
        ret
 
        .size   _U(strsep), . - _U(strsep)
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strspn.S
===================================================================
--- trunk/avr-libc/libc/string/strspn.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strspn.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -39,6 +39,8 @@
     the initial segment of \p s which consist only of characters from \p
     accept. The terminating zero is not considered as a part of string.        
*/
 
+#if !defined(__AVR_TINY__)
+
 #ifndef        __DOXYGEN__
 
 #include "macros.inc"
@@ -79,4 +81,7 @@
        ret
 
        .size _U(strspn), . - _U(strspn)
+
 #endif /* !__DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strstr.S
===================================================================
--- trunk/avr-libc/libc/string/strstr.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libc/string/strstr.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -51,6 +51,8 @@
     the substring, or \c NULL if the substring is not found. If \p s2
     points to a string of zero length, the function returns \p s1. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "macros.inc"
@@ -108,3 +110,5 @@
 .size _U(strstr), . - _U(strstr)
 
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libc/string/strtok_r.S
===================================================================
--- trunk/avr-libc/libc/string/strtok_r.S       2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libc/string/strtok_r.S       2010-11-05 13:45:57 UTC (rev 
2191)
@@ -48,6 +48,8 @@
     \returns The strtok_r() function returns a pointer to the next token or
     NULL when no more tokens are found. */
 
+#if !defined(__AVR_TINY__)
+
 #if !defined(__DOXYGEN__)
 
 #include "asmdef.h"
@@ -153,4 +155,7 @@
        ret
 
 ENDFUNC
+
 #endif /* not __DOXYGEN__ */
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/acos.S
===================================================================
--- trunk/avr-libc/libm/fplib/acos.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/acos.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -33,6 +33,10 @@
      The acos() function calculates the arc cosine of x; that is the value
      whose cosine is x.
  */
+ 
+ 
+#if !defined(__AVR_TINY__)
+ 
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -60,3 +64,5 @@
   ; round
 1:     rjmp    _U(__fp_round)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/addsf3x.S
===================================================================
--- trunk/avr-libc/libm/fplib/addsf3x.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/addsf3x.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -41,6 +41,8 @@
      rA2.rA1.rA0.rAE.ZH
  */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -172,3 +174,5 @@
        ror     rA2
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/asin.S
===================================================================
--- trunk/avr-libc/libm/fplib/asin.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/asin.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -33,6 +33,10 @@
      The asin() function returns the arc sine in radians and the value is
      mathematically defined to be between -PI/2 and PI/2 (inclusive).
  */
+
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -80,3 +84,5 @@
        .byte   0xab,0xaa,0xaa,0x2a,0x3e        ; 1/6
        .byte   0x00,0x00,0x00,0x80,0x3f        ; 1
        .end
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/atan.S
===================================================================
--- trunk/avr-libc/libm/fplib/atan.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/atan.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -42,6 +42,9 @@
            return x * (1 - C1 * x**2 + ... + C8 * x**16)
  */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -112,3 +115,5 @@
        .byte   0x91,0x6b,0xaa,0xaa,0xbe        ; -0.3333314528
        .byte   0x00,0x00,0x00,0x80,0x3f        ;  1.0000000000
        .end
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/atan2.S
===================================================================
--- trunk/avr-libc/libm/fplib/atan2.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/atan2.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -54,6 +54,10 @@
        else
            return -Pi + atan(y/x)      // -3*Pi/4 .. -Pi
  */
+
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -137,3 +141,5 @@
 
 9:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/cbrt.S
===================================================================
--- trunk/avr-libc/libm/fplib/cbrt.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/cbrt.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,8 @@
 
 /* $Id$        */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -358,3 +360,5 @@
        ret
 
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/ceil.S
===================================================================
--- trunk/avr-libc/libm/fplib/ceil.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/ceil.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -37,6 +37,9 @@
      ceil(-1.9) --> -1.0
  */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -68,3 +71,5 @@
 
 .L_nf: rjmp    _U(__fp_mpack)  ; pass nonfinite arg as is
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/divsf3x.S
===================================================================
--- trunk/avr-libc/libm/fplib/divsf3x.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/divsf3x.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -36,6 +36,8 @@
      rA2.rA1.rA0.rAE.ZH
  */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -172,3 +174,5 @@
        com     ZL
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/exp.S
===================================================================
--- trunk/avr-libc/libm/fplib/exp.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/exp.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -120,3 +122,5 @@
        .byte   0xf6,0x17,0x72,0x31,0xbf        ; -0.6931471802
        .byte   0x00,0x00,0x00,0x80,0x3f        ;  1.0000000000
        .end
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fdim.S
===================================================================
--- trunk/avr-libc/libm/fplib/fdim.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fdim.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -81,3 +83,5 @@
 
 .L_nan:        rjmp    _U(__fp_nan)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fixsfsi.S
===================================================================
--- trunk/avr-libc/libm/fplib/fixsfsi.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fixsfsi.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -53,3 +55,5 @@
        rjmp    _U(__fp_szero)          ; return 0x80000000
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/floatsisf.S
===================================================================
--- trunk/avr-libc/libm/fplib/floatsisf.S       2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/floatsisf.S       2010-11-05 13:45:57 UTC (rev 
2191)
@@ -33,6 +33,8 @@
    float __floatunsisf (unsigned long)
  */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -112,3 +114,5 @@
        bld     rA3, 7          ; sign
 9:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/floatundisf.S
===================================================================
--- trunk/avr-libc/libm/fplib/floatundisf.S     2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/floatundisf.S     2010-11-05 13:45:57 UTC (rev 
2191)
@@ -37,6 +37,9 @@
      rA3.rA2.rA1.rA0
  */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -126,3 +129,5 @@
        bld     rA3, 7          ; sign
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/floor.S
===================================================================
--- trunk/avr-libc/libm/fplib/floor.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/floor.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -68,3 +70,5 @@
 
 .L_nf: rjmp    _U(__fp_mpack)  ; pass nonfinite arg as is
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fma.S
===================================================================
--- trunk/avr-libc/libm/fplib/fma.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fma.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -50,3 +52,5 @@
        rcall   _U(__addsf3x)
        rjmp    _U(__fp_round)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fmax.S
===================================================================
--- trunk/avr-libc/libm/fplib/fmax.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fmax.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -78,3 +80,5 @@
        ror     rA3
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fmin.S
===================================================================
--- trunk/avr-libc/libm/fplib/fmin.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fmin.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -78,3 +80,5 @@
        ror     rA3
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fmod.S
===================================================================
--- trunk/avr-libc/libm/fplib/fmod.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fmod.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -130,3 +132,5 @@
        brne    9b
        rjmp    8b
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_cmp.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_cmp.S  2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fp_cmp.S  2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -98,3 +100,5 @@
        adc     rA2, r1         ; C = 0 at any case
 9:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_mpack.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_mpack.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_mpack.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -75,3 +77,5 @@
        ret
 
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_powser.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_powser.S       2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_powser.S       2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -104,3 +106,5 @@
        pop     YH
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_pscA.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_pscA.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fp_pscA.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -49,3 +51,5 @@
        cpc     r0, rA3
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_pscB.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_pscB.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/fp_pscB.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -49,3 +51,5 @@
        cpc     r0, rB3
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_round.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_round.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_round.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -61,3 +63,5 @@
 
 3:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_sinus.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_sinus.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_sinus.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -72,3 +74,5 @@
        .byte   0xa6,0xaa,0xaa,0x2a,0xbe        ; -0.1666666664
        .byte   0x00,0x00,0x00,0x80,0x3f        ;  1.0000000000
        .end                            
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_split3.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_split3.S       2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_split3.S       2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -116,3 +118,5 @@
 8:     sec
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/fp_trunc.S
===================================================================
--- trunk/avr-libc/libm/fplib/fp_trunc.S        2010-10-26 14:06:17 UTC (rev 
2190)
+++ trunk/avr-libc/libm/fplib/fp_trunc.S        2010-11-05 13:45:57 UTC (rev 
2191)
@@ -29,6 +29,9 @@
 
 /* $Id$ */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -82,3 +85,5 @@
        brlo    4b
 9:     ret                     ; C == 0
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/frexp.S
===================================================================
--- trunk/avr-libc/libm/fplib/frexp.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/frexp.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -94,3 +96,5 @@
 .L_nf:
        rjmp    _U(__fp_mpack)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/isinf.S
===================================================================
--- trunk/avr-libc/libm/fplib/isinf.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/isinf.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -51,3 +53,5 @@
 1:     inc     r24
 2:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/ldexp.S
===================================================================
--- trunk/avr-libc/libm/fplib/ldexp.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/ldexp.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -110,3 +112,5 @@
 .L_zero:
        rjmp    _U(__fp_szero)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/log.S
===================================================================
--- trunk/avr-libc/libm/fplib/log.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/log.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -159,3 +161,5 @@
        .byte   0x00,0x00,0x00,0x00,0x00        ;  0.0000000000
                                                                                
        
        .end
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/lrint.S
===================================================================
--- trunk/avr-libc/libm/fplib/lrint.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/lrint.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -131,3 +133,5 @@
 .L_zr: rjmp    _U(__fp_zero)   ; return 0x00000000
 
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/lround.S
===================================================================
--- trunk/avr-libc/libm/fplib/lround.S  2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/lround.S  2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,9 @@
 
 /* $Id$ */
 
+
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -118,3 +121,5 @@
 .L_zr: rjmp    _U(__fp_zero)   ; return 0x00000000
 
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/modf.S
===================================================================
--- trunk/avr-libc/libm/fplib/modf.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/modf.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -111,3 +113,5 @@
        std     Z+3, rB3
 1:     ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/mulsf3x.S
===================================================================
--- trunk/avr-libc/libm/fplib/mulsf3x.S 2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/mulsf3x.S 2010-11-05 13:45:57 UTC (rev 2191)
@@ -32,6 +32,8 @@
 /*
  */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -252,3 +254,5 @@
        bld     rA3, 7          ; sign
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/pow.S
===================================================================
--- trunk/avr-libc/libm/fplib/pow.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/pow.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -212,3 +214,5 @@
        rcall   _U(__mulsf3)
        rjmp    _U(exp)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/round.S
===================================================================
--- trunk/avr-libc/libm/fplib/round.S   2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/round.S   2010-11-05 13:45:57 UTC (rev 2191)
@@ -28,6 +28,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -88,4 +90,7 @@
 
 .L_nf: rjmp    _U(__fp_mpack)  ; pass nonfinite arg "as is"
 .L_zr: rjmp    _U(__fp_szero)  ; return +0.0/-0.0
+
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/sin.S
===================================================================
--- trunk/avr-libc/libm/fplib/sin.S     2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/sin.S     2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -44,3 +46,5 @@
        subi    ZL, -2
        rjmp    _U(__fp_sinus)
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/sinh.S
===================================================================
--- trunk/avr-libc/libm/fplib/sinh.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/sinh.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -96,3 +98,5 @@
        .byte   0xab,0xaa,0xaa,0x2a,0x3e        ; 1/6
        .byte   0x00,0x00,0x00,0x80,0x3f        ; 1
        .end
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/sqrt.S
===================================================================
--- trunk/avr-libc/libm/fplib/sqrt.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/sqrt.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE. */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -182,3 +184,5 @@
        ror     rA2
        ret
 ENDFUNC
+
+#endif /* !defined(__AVR_TINY__) */

Modified: trunk/avr-libc/libm/fplib/tanh.S
===================================================================
--- trunk/avr-libc/libm/fplib/tanh.S    2010-10-26 14:06:17 UTC (rev 2190)
+++ trunk/avr-libc/libm/fplib/tanh.S    2010-11-05 13:45:57 UTC (rev 2191)
@@ -29,6 +29,8 @@
 
 /* $Id$ */
 
+#if !defined(__AVR_TINY__)
+
 #include "fp32def.h"
 #include "asmdef.h"
 
@@ -114,3 +116,5 @@
        .byte   0xab,0xaa,0xaa,0xaa,0xbe        ; -1/3
        .byte   0x00,0x00,0x00,0x80,0x3f        ; 1
        .end
+
+#endif /* !defined(__AVR_TINY__) */


_______________________________________________
avr-libc-commit mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/avr-libc-commit



reply via email to

[Prev in Thread] Current Thread [Next in Thread]