diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-06-21 07:11:53 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-06-21 07:11:53 +0000 |
| commit | b375f06ffad86c83665257e1e42f963a1efd6ebe (patch) | |
| tree | a2510103917b624dc17ba7c05098336859316987 /contrib | |
| parent | Regenerate. (diff) | |
| download | rtems-b375f06ffad86c83665257e1e42f963a1efd6ebe.tar.bz2 | |
Remove.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110323.diff | 3704 | ||||
| -rw-r--r-- | contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110423.diff | 3730 |
2 files changed, 0 insertions, 7434 deletions
diff --git a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110323.diff b/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110323.diff deleted file mode 100644 index 85ffbce9f1..0000000000 --- a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110323.diff +++ /dev/null @@ -1,3704 +0,0 @@ -diff -Naur newlib-1.19.0.orig/newlib/ChangeLog newlib-1.19.0/newlib/ChangeLog ---- newlib-1.19.0.orig/newlib/ChangeLog 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/ChangeLog 2011-03-24 13:21:38.863638253 +0100 -@@ -1,3 +1,162 @@ -+2011-03-23 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/sys/dirent.h: Add const to "select" parameter. -+ -+2011-03-03 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/string.h: Include sys/cdefs.h. -+ -+2011-03-03 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/sys/cdefs.h (__CONCAT1): Define. -+ (__CONCAT): Define. -+ (__STRING): Define. -+ (__XSTRING): Define. -+ (__ASMNAME): Define. -+ * libc/include/string.h (strerror_r): Use __ASMNAME to take target -+ specific label prefixes into account. -+ -+2011-03-01 Aaron Landwehr <snaphat@gmail.com> -+ -+ * libm/complex/cproj.c: Fix typo. -+ * libm/complex/cprojf.c: Ditto. -+ -+2011-02-22 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/stdio/fmemopen.c (fmemopen): Fix EINVAL condition. Avoid SEGV -+ if incoming buffer is NULL. -+ -+2011-02-09 Eric Blake <eblake@redhat.com> -+ -+ * libc/include/string.h (strerror_r): Update declaration. -+ * libc/string/strerror.c (strerror): Update documentation. -+ * libc/string/strerror_r.c (strerror_r): Always return -+ NUL-terminated string; don't overwrite too-short buf. -+ * libc/string/xpg_strerror_r.c (__xpg_strerror_r): Implement POSIX -+ variant. -+ * libc/string/Makefile.am (GENERAL_SOURCES): Build new file. -+ * libc/string/Makefile.in: Regenerate. -+ -+2011-02-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/stdlib.h: More ansi-compliance. -+ -+2011-02-01 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/stdio.h: More ansi-compliance. -+ -+ * libc/include/stdlib.h: Remove atoff. -+ * libc/stdlib/atoff.c: Remove. -+ * libc/stdlib/atof.c: Remove atoff. -+ * libc/stdlib/Makefile.am: Remove atoff. -+ * libc/stdlib/Makefile.in: Regenerate. -+ -+ * libc/include/stdio.h: Make fdopen accessible to c99. -+ -+2011-01-31 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/crt0.c: Add clock_gettime, gettimeofday, -+ sched_yield. -+ -+2011-01-28 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/stdio/fclose.c: Only use sfp lock to guard non-atomic -+ changes of flags and fp lock. -+ * libc/stdio/freopen.c: Ditto. -+ * libc/stdio64/freopen64.c: Ditto. -+ * libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks -+ which guard entire function to avoid potential deadlocks when using -+ stdio functions in multiple thraeds. -+ * libc/stdio/fgets.c: Ditto. -+ * libc/stdio/fgetwc.c: Ditto. -+ * libc/stdio/fgetws.c: Ditto. -+ * libc/stdio/fread.c: Ditto. -+ * libc/stdio/fseek.c: Ditto. -+ * libc/stdio/getc.c: Ditto. -+ * libc/stdio/getdelim.c: Ditto. -+ * libc/stdio/gets.c: Ditto. -+ * libc/stdio/vfscanf.c: Ditto. -+ * libc/stdio/vfwscanf.c: Ditto. -+ -+ * libc/stdio/fflush.c (_fflush_r): Split out core functionality into -+ new function __sflush_r. Just lock file and call __sflush_r from here. -+ * libc/stdio/fwalk.c (_fwalk): Remove static helper function and move -+ functionality back into main function. Don't walk a file with flags -+ value of 1. Add comment. -+ (_fwalk_reent): Ditto. -+ * libc/stdio/local.h (__sflush_r): Declare. -+ * libc/stdio/refill.c (__srefill): Before calling fwalk, set flags -+ value to 1 so this file pointer isn't walked. Revert flags afterwards -+ and call __sflush_r for this fp if necessary. Add comments. -+ -+2011-01-27 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/sys/features.h: Define __STDC_ISO_10646__ for Cygwin. -+ * libc/include/wchar.h: Include features.h. -+ -+2011-01-15 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> -+ -+ * libc/include/sys/types.h (ulong): Add typedef. -+ -+2011-01-12 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/math/w_tgamma.c: Only build ifndef _DOUBLE_IS_32BITS. -+ * libm/math/wf_tgamma.c: Map tgamma to tgammaf, ifdef _DOUBLE_IS_32BITS. -+ -+2011-01-11 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/string.h: Remove Cygwin DEFS_H kludge. -+ -+2011-01-10 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/machine/mips/strlen.c (strlen): Add delay slot for R3000. -+ -+2011-01-10 Joel Sherrill <joel.sherrill@oarcorp.com> -+ -+ * libc/include/string.h: Make strsignal() available unconditionally. -+ -+2011-01-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/crt0.c: Adjust free() and calloc() to match their -+ public decls. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * Makefile.am: Move cleaning targ-include to clean-local. -+ * Makefile.in: Regenerate. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/open_memstream.c (internal_open_memstream_r): -+ Don't limit c->max to 64*1024 on targets with SIZE_MAX < 64*1024. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/xdr/xdr.c: Fix typos in #errors. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/xdr/xdr_private.h: Include <stdint.h> -+ * libc/xdr/xdr_rec.c: Include limits.h -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/Makefile.am (SUBDEFS): Remove redundant posix/stmp-def. -+ * libc/Makefile.in: Regenerate. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/configure.in: Remove redundant posix_dir processing. -+ * libc/configure: Regenerate. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * doc/makedoc.c: Add cludge to make makedoc 64bit compliant. -+ -+2010-12-31 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * MAINTAINERS: Change corinna@vinchen.de to corinna@vinschen.de. -+ - 2010-12-16 Jeff Johnston <jjohnstn@redhat.com> - - * NEWS: Update with 1.19.0 info. -@@ -28,12 +187,12 @@ - - * libm/mathfp/sf_logarithm.c: Change isfinitef reference to isfinite. - --2010-12-08 Ralf Corsepius <ralf.corsepius@rtems.org> -+2010-12-08 Ralf Corsépius <ralf.corsepius@rtems.org> - - * include/sys/types.h: Add #if defined(__rtems__) around - pthread_attr_t.guardsize. - --2010-12-08 Joel Sherrill <joel@OARcorp.com> -+2010-12-08 Joel Sherrill <joel@OARcorp.com> - - * include/pthread.h: Add pthread_attr_setstack, pthread_attr_getstack, - pthread_attr_getguardsize, pthread_attr_setguardsize. -@@ -847,7 +1006,7 @@ - (__cp_index): Map invalid Windows codepage number 101 to - GEORGIAN-PS conversion array, 102 to PT154 conversion array. - --2010-02-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2010-02-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/telldir.c: Remove bogus nested prototype of lseek(). - -@@ -1005,6 +1164,18 @@ - * libc/include/sys/unistd.h (suboptarg, getsubopt): Move... - * libc/include/stdlib.h: ...here, to match POSIX for getsubopt. - -+2009-12-18 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/search/db_local.h: -+ Use __uint32_t instead of u_int (prototype mismatches). -+ * libc/search/extern.h (__buf_init): -+ Use __uint32_t instead of int (16 bit target portability). -+ * libc/search/hash_buf.c: Use ptrdiff_t instead of __uint32_t, -+ use __uint32_t instead of int (16 bit target portability). -+ * libc/search/hash.h: Use __uint32_it instead of int -+ (16 bit target portability). -+ * libm/common/modfl.c: Add cast to (double*) to avoid GCC warning. -+ - 2009-12-17 Jeff Johnston <jjohnstn@redhat.com> - - * NEWS: Update with 1.18.0 info. -@@ -1048,17 +1219,17 @@ - * libc/stdlib/atexit.c: Ditto. - * libc/stdlib/on_exit.c: Ditto. - --2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/ieeefp.h: Rework __IEEE_*_ENDIAN handling. - * libc/machine/arm/machine/endian.h: Remove (Conflicts with - libc/include/machine/endian.h) - --2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/setjmp.h: Set up _JBLEN #ifdef __m68k__. - --2009-12-17 Ralf Corsepius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/pthread.h: Add pthread_atfork, pthread_rwlock_unlock - * libc/include/sys/stat.h: Use struct timespec st_*tim, -@@ -1076,11 +1247,11 @@ - and ETOOMANYREFS into general list as they are referenced - by OpenGroup and needed by RTEMS. - --2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/search/hcreate.c: Don't include <sys/queue.h> (Unused). - --2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/machine/_types.h: New (Derived from - machine/_default_types.h). -@@ -1204,6 +1375,18 @@ - rather check for return value of -1 and errno. Handle EINVAL - just like ESPIPE. Only set fp->_offset if errno is 0. - -+2009-10-29 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/inttypes.h: -+ Rework logic to determine PRI*PTR. -+ Prefer long64 over longlong64. -+ * libc/include/machine/_default_types.h: -+ Sync logic for __int32 with stdint.h (Prefer long over int). -+ * libc/include/stdint.h: -+ Remove __SPU__ hack. -+ Prefer int for int16_t (sync with _default_types.h). -+ Rework intptr_t determination. -+ - 2009-10-27 Nick Clifton <nickc@redhat.com> - - * MAINTAINERS (ARM): Add myself as an ARM maintainer. -@@ -1368,16 +1551,16 @@ - * libc/locale/locale.c: Drop Cygwin-specific windows.h include. - (loadlocale): Call __set_charset_from_codepage with 0 codepage. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdlib.h: Add posix_memalign. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host (*-rtems*): Remove -DMISSING_SYSCALL_NAMES. - Add -DHAVE_BLKSIZE, -D_NO_WORDEXP -D_NO_POPEN. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host (m32c): Move setting -DABORT_PROVIDED to second - "case $host". -@@ -2576,6 +2759,12 @@ - * libc/stdio/vfprintf.c: Ditto. - * libc/stdio/vswprintf.c: Ditto. - -+2009-03-09 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/machine/powerpc/times.c: Remove. -+ * libc/machine/powerpc/Makefile.am: Remove times.c. -+ * libc/machine/powerpc/Makefile.in: Regenerate. -+ - 2009-03-09 Brooks Moses <brooks@codesourcery.com> - - * libc/machine/arm/arm_asm.h: Fix typo. -@@ -2673,7 +2862,7 @@ - - * libc/machine/arm/strcpy.c: Add missing comma. - --2009-02-26 Ralf Corsepius <ralf.corsepius@rtems.org> -+2009-02-26 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/machine/lm32/configure.in: Let - AC_CONFIG_SRCDIR point to setjmp.S instead of setjmp.s -@@ -2859,24 +3048,24 @@ - * libc/string/wcstrings.tex: Ditto. - * libc/string/Makefile.in: Regenerated. - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/stdio/fputws.c: Fix documentation. - * libc/stdio/getwchar.c: Ditto. - * libc/stdio/putwchar.c: Ditto. - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/features.h: Set RTEMS's _POSIX_MONOTONIC_CLOCK to - 200112L (SUSv3 compliance). - Comment out RTEMS's _POSIX_SHARED_MEMORY_OBJECTS (Unsupported). - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/crt0.c: Add stubs for getdents(), nanosleep(), - _execve(), _exit(). - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host: Let *rtems* default to c99-formats. - -@@ -3026,7 +3215,7 @@ - <linux/dirent.h>. - * libc/sys/linux/io64.c: Add weak alias for _stat64. - --2008-11-27 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/telldir.c: Use #if !defined() instead of #ifndef - to fix GCC warning. -@@ -3198,17 +3387,17 @@ - * libc/unix/collate.c (__collate_err): simplify to remove unnecessary - strdup() and strlen() calls, also getting rid of a compiler warning. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/config.h: Don't put - __ATTRIBUTE_IMPURE_PTR__ into .sdata section for mips-rtems. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/runetype.h: Add include of stddef.h and remove - defining standard types: size_t and wchar_t. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/pthread.h: Remove prototypes for - pthread_attr_getcputime and pthread_attr_setcputime which -@@ -5263,7 +5452,7 @@ - * libc/machine/spu/sprintf.c: Ditto. - * libc/machine/spu/sscanf.c: Ditto. - --2007-08-03 Ralf Corsepius <ralf.corsepius@rtems.org> -+2007-08-03 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/tar.h: New. - -@@ -6455,7 +6644,7 @@ - * libc/include/sys/unistd.h: Define all _SC_xxx values as - required by SUSv3. Unify formatting. - --2007-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> -+2007-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/errno.h: Add ECANCELED. - -@@ -7248,7 +7437,7 @@ - * libc/include/sys/signal.h (sigdelset, sigfillset, sigismember): New macros. - (sigaddset, sigemptyset): Add return code. - --2006-04-13 Ralf Corsepius <ralf.corsepius@rtems.org> -+2006-04-13 Ralf Corsépius <ralf.corsepius@rtems.org> - - * acinclude.m4: New _NEWLIB_VERSION. - * acinclude.m4(NEWLIB_CONFIGURE): AC_REQUIRE(_NEWLIB_VERSION). -@@ -7737,7 +7926,7 @@ - * libc/sys/linux/sys/stat.h: Change *stat64 prototypes to - take a pointer to struct stat64 rather than struct stat. - --2005-12-16 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Prefer long over int for int32_t. - Use __have_long32 to set up int32_t. -@@ -7766,7 +7955,7 @@ - * libc/include/sys/types.h: Remove the ifdef armour around - standard POSIX types. - --2005-12-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-12-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/crt0.c: Add rtems_gxx_key_create, - rtems_gxx_key_delete, rtems_gxx_getspecific, -@@ -7845,7 +8034,7 @@ - * libc/sys/linux/sys/unistd.h (readlink, symlink): New - prototypes. - --2005-11-01 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-11-01 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Cleanup #if vs. #ifdef. - -@@ -8069,11 +8258,11 @@ - * libc/stdlib/mallocr.c (mALLOc, rEALLOCc, mEMALIGn): Set errno - to ENOMEM on failure. - --2005-10-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Add [u]int_fast<N>_t types. - --2005-10-04 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-04 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Move magic to set __have_long* to the - beginning. Use #if __have* instead of #if defined(__have*). -@@ -8089,14 +8278,14 @@ - * libc/sys/linux/include/stdint.h: Include <sys/types.h> and - incorporate Ralf's change below. - --2005-10-03 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-03 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: - Use __INTMAX_TYPE__ to derive intmax_t. - Use __UINTMAX_TYPE__ to derive uintmax_t. - Fix minor typo. - --2005-09-27 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-09-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Correct __STDINT_EXP macro incorrectly - handling GCC >= 4. -@@ -8432,16 +8621,16 @@ - * configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add - -DCOMPACT_CTYPE. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/include/inttypes.h: New file. - * libc/sys/rtems/include/stdint.h: Ditto. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/string/memcmp.c: Fix to avoid pointer signedness warning. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/_types.h: New file. - * libc/include/sys/types.h: Do not check for __rtems__ -@@ -8450,7 +8639,7 @@ - * libc/sys/rtems/machine/_types.h: Removed. Replaced with - shared header file. - --2005-02-25 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add - L qualifier for these long constants. -@@ -8466,13 +8655,13 @@ - * libc/time/strftime.c (strftime): Fix '%x' to deal with negative - years. Fix '%z' to use long, not int. - --2005-02-24 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-24 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libm/common/s_fpclassify.c: Use __uint32_t instead of int to - manipulate float values in integer form. - * libm/common/sf_round.c: Ditto. - --2005-02-24 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-24 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/types.h [__rtems__]: Include new - header file machine/_types.h. -@@ -8836,7 +9025,7 @@ - * libc/stdio/fread.c (fread): Fix return value for unbuffered - fread. - --2004-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2004-10-25 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/include/machine/setjmp.h: Add AVR support. - * libc/sys/rtems/crt0.S [__AVR__]: Add __stack. -@@ -15068,7 +15257,7 @@ - - * libc/include/sys/unistd.h: Prototype chroot() for RTEMS. - --2001-08-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2001-08-29 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/machine/i386/f_atan2.S, libc/machine/i386/f_atan2f.S, - libc/machine/i386/f_exp.c, libc/machine/i386/f_expf.c, -@@ -15745,7 +15934,7 @@ - * libc/sys/linux/sys/utsname.h: Ditto. - * libc/sys/linux/sys/wait.h: Ditto. - --2000-12-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2000-12-08 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: $(INSTALL), $(INSTALL_DATA), and $(INSTALL_PROGRAM) - can be a relative path to $(top_srcdir)/install.sh so ensure the -@@ -16650,7 +16839,7 @@ - * libc/include/stdlib.h: add ptsname, grantpt, unlockpt to cygwin - section - --Sat Oct 2 02:02:00 MEST 1999 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+Sat Oct 2 02:02:00 MEST 1999 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/machine/sh/asm.h: Added __SH4_SINGLE__ to DELAYED_BRANCHES - * libc/machine/sh/memcpy.S: Fix line wrapping in SL macro -diff -Naur newlib-1.19.0.orig/newlib/ChangeLog.rtems newlib-1.19.0/newlib/ChangeLog.rtems ---- newlib-1.19.0.orig/newlib/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.19.0/newlib/ChangeLog.rtems 2011-03-24 13:21:38.864638267 +0100 -@@ -0,0 +1,83 @@ -+2011-01-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/open_memstream.c: Replace 64 * 1024 with 0x10000 to -+ avoid integer overflow on h8300. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/tmpnam.c: Include <stdint.h>. -+ Use intptr_t instead of _POINTER_INT for improved portability. -+ * libc/misc/__dprintf.c: Include <stdint.h> -+ Use intptr_t instead of _POINTER_INT for improved portability. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/common/s_round.c: Cast const int to __int32_t. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/math/e_scalb.c: Include <limits.h>. -+ Don't rely on 65000 being a valid int. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/posix/readdir.c: Include <stdint.h>. -+ Cast to intptr_t instead of int. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/memccpy.c, libc/string/memchr.c, -+ libc/string/memcmp.c, libc/string/memcpy.c, -+ libc/string/memmove.c, libc/string/mempcpy.c, -+ libc/string/memset.c, libc/string/stpcpy.c, -+ libc/string/stpncpy.c, libc/string/strcpy.c, -+ libc/string/strlen.c, libc/string/strncat.c, -+ libc/string/strncpy.c (UNALIGNED): -+ Include <stdint.h>. -+ Cast to intptr_t instead of long. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * Makefile.am: Don't install include/rpc/*.h. -+ * Makefile.in: Regenerate. -+ * libc/Makefile.am: Install include/rpc/xdr.h include/rpc/types.h. -+ * libc/Makefile.in: Regenerate. -+ -+2010-12-30 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/signal.h: Don't provide sighandler_t. -+ -+2010-12-29 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/sys/dir.h: Remove. -+ -+2010-08-10 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ PR 1475/newlib: -+ * libc/include/stdint.h: Fall back to compute SIZE_MAX based on -+ __SIZEOF_SIZE_T__ and __CHAR_BIT__ if available. -+ -+2010-08-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/strcat.c: -+ Include <stdint.h>. Use uintptr_t instead of long in ALIGNED. -+ * libc/string/strchr.c, libc/string/strcmp.c, libc/string/strncmp.c: -+ Include <stdint.h>. Use uintptr_t instead of long in UNALIGNED. -+ -+2010-07-08 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/index.c, libc/string/rindex.c: Include <string.h>. -+ * libc/stdlib/putenv_r.c: Include <strings.h> -+ -+2010-03-25 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/string.h: Remove bcmp, bcopy, bzero, ffs, index, rindex, -+ strcasecmp, strncasecmp (Moved to strings.h). -+ Remove strcmpi, stricmp, strncmpi, strnicmp. -+ * libc/misc/ffs.c: Use <strings.h> instead of <string.h>. -+ * libc/string/bcmp.c: Use <strings.h> instead of <string.h>. -+ * libc/string/bzero.c: Use <strings.h> instead of <string.h>. -+ * libc/string/rindex.c: Use <strings.h> instead of <string.h>. -+ * libc/string/strcasecmp.c: Use <strings.h> instead of <string.h>. -+ * libc/string/strncasecmp.c: Use <strings.h> instead of <string.h>. -+ -diff -Naur newlib-1.19.0.orig/newlib/doc/makedoc.c newlib-1.19.0/newlib/doc/makedoc.c ---- newlib-1.19.0.orig/newlib/doc/makedoc.c 2009-03-25 22:16:04.000000000 +0100 -+++ newlib-1.19.0/newlib/doc/makedoc.c 2011-03-24 13:21:38.865638281 +0100 -@@ -57,7 +57,7 @@ - { - char *ptr; - unsigned int write_idx; -- unsigned int size; -+ size_t size; - } string_type; - - -@@ -68,7 +68,7 @@ - - static void DEFUN(init_string_with_size,(buffer, size), - string_type *buffer AND -- unsigned int size ) -+ size_t size ) - { - buffer->write_idx = 0; - buffer->size = size; -@@ -219,8 +219,8 @@ - stinst_type *pc; - stinst_type sstack[STACK]; - stinst_type *ssp = &sstack[0]; --int istack[STACK]; --int *isp = &istack[0]; -+long istack[STACK]; -+long *isp = &istack[0]; - - typedef int *word_type; - -@@ -270,7 +270,7 @@ - { - isp++; - pc++; -- *isp = (int)(*pc); -+ *isp = (long)(*pc); - pc++; - - } -diff -Naur newlib-1.19.0.orig/newlib/libc/configure newlib-1.19.0/newlib/libc/configure ---- newlib-1.19.0.orig/newlib/libc/configure 2010-12-16 22:58:39.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/configure 2011-03-24 13:21:38.869638341 +0100 -@@ -625,7 +625,10 @@ - HAVE_XDR_DIR_TRUE - LIBC_XDR_DEF - LIBC_XDR_LIB -+HAVE_POSIX_DIR_FALSE -+HAVE_POSIX_DIR_TRUE - LIBC_POSIX_DEF -+LIBC_POSIX_LIB - HAVE_STDIO64_DIR_FALSE - HAVE_STDIO64_DIR_TRUE - LIBC_STDIO64_DEF -@@ -638,9 +641,6 @@ - HAVE_SIGNAL_DIR_TRUE - LIBC_SIGNAL_DEF - LIBC_SIGNAL_LIB --HAVE_POSIX_DIR_FALSE --HAVE_POSIX_DIR_TRUE --LIBC_POSIX_LIB - CRT0 - subdirs - CPP -@@ -11805,24 +11805,6 @@ - - - --LIBC_POSIX_LIB= --if test -n "${posix_dir}"; then -- if test "${use_libtool}" = "yes"; then -- LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext} -- else -- LIBC_POSIX_LIB=${posix_dir}/lib.${aext} -- fi --fi -- -- if test x${posix_dir} != x; then -- HAVE_POSIX_DIR_TRUE= -- HAVE_POSIX_DIR_FALSE='#' --else -- HAVE_POSIX_DIR_TRUE='#' -- HAVE_POSIX_DIR_FALSE= --fi -- -- - LIBC_SIGNAL_LIB= - LIBC_SIGNAL_DEF= - if test -n "${signal_dir}"; then -@@ -12225,10 +12207,6 @@ - as_fn_error "conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${HAVE_POSIX_DIR_TRUE}" && test -z "${HAVE_POSIX_DIR_FALSE}"; then -- as_fn_error "conditional \"HAVE_POSIX_DIR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${HAVE_SIGNAL_DIR_TRUE}" && test -z "${HAVE_SIGNAL_DIR_FALSE}"; then - as_fn_error "conditional \"HAVE_SIGNAL_DIR\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff -Naur newlib-1.19.0.orig/newlib/libc/configure.in newlib-1.19.0/newlib/libc/configure.in ---- newlib-1.19.0.orig/newlib/libc/configure.in 2010-04-23 01:32:40.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/configure.in 2011-03-24 13:21:38.869638341 +0100 -@@ -41,17 +41,6 @@ - dnl for the library and an automake conditional for whether we should - dnl build the library. - --LIBC_POSIX_LIB= --if test -n "${posix_dir}"; then -- if test "${use_libtool}" = "yes"; then -- LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext} -- else -- LIBC_POSIX_LIB=${posix_dir}/lib.${aext} -- fi --fi --AC_SUBST(LIBC_POSIX_LIB) --AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x) -- - LIBC_SIGNAL_LIB= - LIBC_SIGNAL_DEF= - if test -n "${signal_dir}"; then -diff -Naur newlib-1.19.0.orig/newlib/libc/include/inttypes.h newlib-1.19.0/newlib/libc/include/inttypes.h ---- newlib-1.19.0.orig/newlib/libc/include/inttypes.h 2009-01-19 23:02:06.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/inttypes.h 2011-03-24 13:21:38.869638341 +0100 -@@ -242,15 +242,17 @@ - #define SCNxMAX __SCNMAX(x) - - /* ptr types */ --#if __have_long64 --#define __PRIPTR(x) __STRINGIFY(l##x) --#define __SCNPTR(x) __STRINGIFY(l##x) --#elif __have_longlong64 --#define __PRIPTR(x) __STRINGIFY(ll##x) --#define __SCNPTR(x) __STRINGIFY(ll##x) -+#if INTPTR_MAX == INT64_MAX -+#define __PRIPTR(x) __PRI64(x) -+#define __SCNPTR(x) __SCN64(x) -+#elif INTPTR_MAX == INT32_MAX -+#define __PRIPTR(x) __PRI32(x) -+#define __SCNPTR(x) __SCN32(x) -+#elif INTPTR_MAX == INT16_MAX -+#define __PRIPTR(x) __PRI16(x) -+#define __SCNPTR(x) __SCN16(x) - #else --#define __PRIPTR(x) __STRINGIFY(x) --#define __SCNPTR(x) __STRINGIFY(x) -+#error cannot determine PRI*PTR - #endif - - #define PRIdPTR __PRIPTR(d) -diff -Naur newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h newlib-1.19.0/newlib/libc/include/machine/_default_types.h ---- newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h 2008-06-12 00:14:54.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/machine/_default_types.h 2011-03-24 13:21:38.869638341 +0100 -@@ -54,14 +54,14 @@ - #endif - #endif - --#if __EXP(INT_MAX) == 0x7fffffffL --typedef signed int __int32_t; --typedef unsigned int __uint32_t; --#define ___int32_t_defined 1 --#elif __EXP(LONG_MAX) == 0x7fffffffL -+#if __EXP(LONG_MAX) == 0x7fffffffL - typedef signed long __int32_t; - typedef unsigned long __uint32_t; - #define ___int32_t_defined 1 -+#elif __EXP(INT_MAX) == 0x7fffffffL -+typedef signed int __int32_t; -+typedef unsigned int __uint32_t; -+#define ___int32_t_defined 1 - #elif __EXP(SHRT_MAX) == 0x7fffffffL - typedef signed short __int32_t; - typedef unsigned short __uint32_t; -diff -Naur newlib-1.19.0.orig/newlib/libc/include/signal.h newlib-1.19.0/newlib/libc/include/signal.h ---- newlib-1.19.0.orig/newlib/libc/include/signal.h 2010-07-13 13:18:55.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/signal.h 2011-03-24 13:21:38.870638356 +0100 -@@ -7,9 +7,6 @@ - _BEGIN_STD_C - - typedef int sig_atomic_t; /* Atomic entity type (ANSI) */ --#ifndef _POSIX_SOURCE --typedef _sig_func_ptr sighandler_t; /* glibc naming */ --#endif /* !_POSIX_SOURCE */ - - #define SIG_DFL ((_sig_func_ptr)0) /* Default action */ - #define SIG_IGN ((_sig_func_ptr)1) /* Ignore action */ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdint.h newlib-1.19.0/newlib/libc/include/stdint.h ---- newlib-1.19.0.orig/newlib/libc/include/stdint.h 2009-04-24 23:55:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/stdint.h 2011-03-24 13:21:38.870638356 +0100 -@@ -33,7 +33,7 @@ - /* Check if "long" is 64bit or 32bit wide */ - #if __STDINT_EXP(LONG_MAX) > 0x7fffffff - #define __have_long64 1 --#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__) -+#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff - #define __have_long32 1 - #endif - -@@ -49,14 +49,14 @@ - #define __int_least8_t_defined 1 - #endif - --#if __STDINT_EXP(SHRT_MAX) == 0x7fff --typedef signed short int16_t; --typedef unsigned short uint16_t; --#define __int16_t_defined 1 --#elif __STDINT_EXP(INT_MAX) == 0x7fff -+#if __STDINT_EXP(INT_MAX) == 0x7fff - typedef signed int int16_t; - typedef unsigned int uint16_t; - #define __int16_t_defined 1 -+#elif __STDINT_EXP(SHRT_MAX) == 0x7fff -+typedef signed short int16_t; -+typedef unsigned short uint16_t; -+#define __int16_t_defined 1 - #elif __STDINT_EXP(SCHAR_MAX) == 0x7fff - typedef signed char int16_t; - typedef unsigned char uint16_t; -@@ -239,6 +239,29 @@ - * GCC doesn't provide an appropriate macro for [u]intptr_t - * For now, use __PTRDIFF_TYPE__ - */ -+#if defined(__SIZEOF_POINTER__) -+#if __SIZEOF_POINTER__ == 8 -+ typedef int64_t intptr_t; -+ typedef uint64_t uintptr_t; -+#define INTPTR_MAX INT64_MAX -+#define INTPTR_MIN INT64_MIN -+#define UINTPTR_MAX UINT64_MAX -+#elif __SIZEOF_POINTER__ == 4 -+ typedef int32_t intptr_t; -+ typedef uint32_t uintptr_t; -+#define INTPTR_MAX INT32_MAX -+#define INTPTR_MIN INT32_MIN -+#define UINTPTR_MAX UINT32_MAX -+#elif __SIZEOF_POINTER__ == 2 -+ typedef int16_t intptr_t; -+ typedef uint16_t uintptr_t; -+#define INTPTR_MAX INT16_MAX -+#define INTPTR_MIN INT16_MIN -+#define UINTPTR_MAX UINT16_MAX -+#else -+#error cannot determine intptr_t -+#endif -+#else - #if defined(__PTRDIFF_TYPE__) - typedef signed __PTRDIFF_TYPE__ intptr_t; - typedef unsigned __PTRDIFF_TYPE__ uintptr_t; -@@ -260,6 +283,7 @@ - #define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1) - #define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1) - #endif -+#endif - - /* Limits of Specified-Width Integer Types */ - -@@ -408,6 +432,8 @@ - /* This must match size_t in stddef.h, currently long unsigned int */ - #ifdef __SIZE_MAX__ - #define SIZE_MAX __SIZE_MAX__ -+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__) -+#define SIZE_MAX (__SIZEOF_SIZE_T__ * __CHAR_BIT__) - #else - #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1) - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio.h newlib-1.19.0/newlib/libc/include/stdio.h ---- newlib-1.19.0.orig/newlib/libc/include/stdio.h 2010-02-26 10:41:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/stdio.h 2011-03-24 13:21:38.870638356 +0100 -@@ -308,7 +308,7 @@ - * Routines in POSIX 1003.1:2001. - */ - --#ifndef __STRICT_ANSI__ -+#if (!defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)) - #ifndef _REENT_ONLY - FILE * _EXFUN(fdopen, (int, const char *)); - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdlib.h newlib-1.19.0/newlib/libc/include/stdlib.h ---- newlib-1.19.0.orig/newlib/libc/include/stdlib.h 2010-07-19 20:21:11.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/stdlib.h 2011-03-24 13:21:38.870638356 +0100 -@@ -38,7 +38,7 @@ - long rem; /* remainder */ - } ldiv_t; - --#ifndef __STRICT_ANSI__ -+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) - typedef struct - { - long long int quot; /* quotient */ -@@ -63,13 +63,12 @@ - int _EXFUN(abs,(int)); - int _EXFUN(atexit,(_VOID (*__func)(_VOID))); - double _EXFUN(atof,(const char *__nptr)); --#ifndef __STRICT_ANSI__ --float _EXFUN(atoff,(const char *__nptr)); --#endif - int _EXFUN(atoi,(const char *__nptr)); --int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr)); - long _EXFUN(atol,(const char *__nptr)); -+#ifndef __STRICT_ANSI__ -+int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr)); - long _EXFUN(_atol_r,(struct _reent *, const char *__nptr)); -+#endif /* ! __STRICT_ANSI__ */ - _PTR _EXFUN(bsearch,(const _PTR __key, - const _PTR __base, - size_t __nmemb, -@@ -80,10 +79,10 @@ - _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn))); - _VOID _EXFUN_NOTHROW(free,(_PTR)); - char * _EXFUN(getenv,(const char *__string)); -+#ifndef __STRICT_ANSI__ - char * _EXFUN(_getenv_r,(struct _reent *, const char *__string)); - char * _EXFUN(_findenv,(_CONST char *, int *)); - char * _EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *)); --#ifndef __STRICT_ANSI__ - extern char *suboptarg; /* getsubopt(3) external variable */ - int _EXFUN(getsubopt,(char **, char * const *, char **)); - #endif -@@ -91,16 +90,16 @@ - ldiv_t _EXFUN(ldiv,(long __numer, long __denom)); - _PTR _EXFUN_NOTHROW(malloc,(size_t __size)); - int _EXFUN(mblen,(const char *, size_t)); --int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *)); - int _EXFUN(mbtowc,(wchar_t *, const char *, size_t)); --int _EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); - int _EXFUN(wctomb,(char *, wchar_t)); --int _EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *)); - size_t _EXFUN(mbstowcs,(wchar_t *, const char *, size_t)); --size_t _EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); - size_t _EXFUN(wcstombs,(char *, const wchar_t *, size_t)); --size_t _EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *)); - #ifndef __STRICT_ANSI__ -+int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *)); -+int _EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); -+int _EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *)); -+size_t _EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); -+size_t _EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *)); - #ifndef _REENT_ONLY - char * _EXFUN(mkdtemp,(char *)); - int _EXFUN(mkostemp,(char *, int)); -@@ -133,10 +132,11 @@ - # endif - #endif - long _EXFUN(strtol,(const char *__n, char **__end_PTR, int __base)); --long _EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); - unsigned long _EXFUN(strtoul,(const char *__n, char **__end_PTR, int __base)); -+#ifndef __STRICT_ANSI__ - unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); -- -+long _EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); -+#endif /* !__STRICT_ANSI__ */ - int _EXFUN(system,(const char *__string)); - - #ifndef __STRICT_ANSI__ -@@ -163,33 +163,39 @@ - int _EXFUN(rand_r,(unsigned *__seed)); - - double _EXFUN(drand48,(_VOID)); --double _EXFUN(_drand48_r,(struct _reent *)); - double _EXFUN(erand48,(unsigned short [3])); --double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3])); - long _EXFUN(jrand48,(unsigned short [3])); --long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3])); - _VOID _EXFUN(lcong48,(unsigned short [7])); --_VOID _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7])); - long _EXFUN(lrand48,(_VOID)); --long _EXFUN(_lrand48_r,(struct _reent *)); - long _EXFUN(mrand48,(_VOID)); --long _EXFUN(_mrand48_r,(struct _reent *)); - long _EXFUN(nrand48,(unsigned short [3])); --long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3])); - unsigned short * - _EXFUN(seed48,(unsigned short [3])); -+_VOID _EXFUN(srand48,(long)); -+long long _EXFUN(atoll,(const char *__nptr)); -+#ifndef __STRICT_ANSI__ -+double _EXFUN(_drand48_r,(struct _reent *)); -+double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3])); -+long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3])); -+_VOID _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7])); -+long _EXFUN(_lrand48_r,(struct _reent *)); -+long _EXFUN(_mrand48_r,(struct _reent *)); -+long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3])); - unsigned short * - _EXFUN(_seed48_r,(struct _reent *, unsigned short [3])); --_VOID _EXFUN(srand48,(long)); - _VOID _EXFUN(_srand48_r,(struct _reent *, long)); --long long _EXFUN(atoll,(const char *__nptr)); - long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr)); -+#endif /* ! __STRICT_ANSI__ */ -+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) - long long _EXFUN(llabs,(long long)); - lldiv_t _EXFUN(lldiv,(long long __numer, long long __denom)); - long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base)); --long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); - unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base)); -+#endif -+#ifndef __STRICT_ANSI__ -+long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); - unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); -+#endif /* ! __STRICT_ANSI__ */ - - #ifndef __CYGWIN__ - _VOID _EXFUN(cfree,(_PTR)); -@@ -203,6 +209,7 @@ - - #endif /* ! __STRICT_ANSI__ */ - -+#ifndef __STRICT_ANSI__ - char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**)); - #ifndef __CYGWIN__ - _PTR _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t)); -@@ -214,6 +221,7 @@ - int _EXFUN(_system_r,(struct _reent *, const char *)); - - _VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *)); -+#endif /* ! __STRICT_ANSI__ */ - - /* On platforms where long double equals double. */ - #ifdef _LDBL_EQ_DBL -diff -Naur newlib-1.19.0.orig/newlib/libc/include/string.h newlib-1.19.0/newlib/libc/include/string.h ---- newlib-1.19.0.orig/newlib/libc/include/string.h 2008-06-18 17:27:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/string.h 2011-03-24 13:21:38.871638371 +0100 -@@ -9,6 +9,7 @@ - - #include "_ansi.h" - #include <sys/reent.h> -+#include <sys/cdefs.h> - - #define __need_size_t - #include <stddef.h> -@@ -49,52 +50,41 @@ - #ifndef __STRICT_ANSI__ - char *_EXFUN(strtok_r,(char *, const char *, char **)); - --int _EXFUN(bcmp,(const void *, const void *, size_t)); --void _EXFUN(bcopy,(const void *, void *, size_t)); --void _EXFUN(bzero,(void *, size_t)); --int _EXFUN(ffs,(int)); --char *_EXFUN(index,(const char *, int)); - _PTR _EXFUN(memccpy,(_PTR, const _PTR, int, size_t)); - _PTR _EXFUN(mempcpy,(_PTR, const _PTR, size_t)); - _PTR _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t)); --char *_EXFUN(rindex,(const char *, int)); - char *_EXFUN(stpcpy,(char *, const char *)); - char *_EXFUN(stpncpy,(char *, const char *, size_t)); --int _EXFUN(strcasecmp,(const char *, const char *)); - char *_EXFUN(strcasestr,(const char *, const char *)); - char *_EXFUN(strdup,(const char *)); - char *_EXFUN(_strdup_r,(struct _reent *, const char *)); - char *_EXFUN(strndup,(const char *, size_t)); - char *_EXFUN(_strndup_r,(struct _reent *, const char *, size_t)); --char *_EXFUN(strerror_r,(int, char *, size_t)); -+/* There are two common strerror_r variants. If you request -+ _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX -+ version. POSIX requires that #undef strerror_r will still let you -+ invoke the underlying function, but that requires gcc support. */ -+#ifdef _GNU_SOURCE -+char *_EXFUN(strerror_r,(int, char *, size_t)); -+#else -+# ifdef __GNUC__ -+int _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r")); -+# else -+int _EXFUN(__xpg_strerror_r,(int, char *, size_t)); -+# define strerror_r __xpg_strerror_r -+# endif -+#endif - size_t _EXFUN(strlcat,(char *, const char *, size_t)); - size_t _EXFUN(strlcpy,(char *, const char *, size_t)); --int _EXFUN(strncasecmp,(const char *, const char *, size_t)); - size_t _EXFUN(strnlen,(const char *, size_t)); - char *_EXFUN(strsep,(char **, const char *)); - char *_EXFUN(strlwr,(char *)); - char *_EXFUN(strupr,(char *)); -+char *_EXFUN(strsignal, (int __signo)); - #ifdef __CYGWIN__ --#ifndef DEFS_H /* Kludge to work around problem compiling in gdb */ --char *_EXFUN(strsignal, (int __signo)); --#endif - int _EXFUN(strtosigno, (const char *__name)); - #endif - --/* These function names are used on Windows and perhaps other systems. */ --#ifndef strcmpi --#define strcmpi strcasecmp --#endif --#ifndef stricmp --#define stricmp strcasecmp --#endif --#ifndef strncmpi --#define strncmpi strncasecmp --#endif --#ifndef strnicmp --#define strnicmp strncasecmp --#endif -- - #endif /* ! __STRICT_ANSI__ */ - - #include <sys/string.h> -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h newlib-1.19.0/newlib/libc/include/sys/cdefs.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h 2002-06-20 21:51:24.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/cdefs.h 2011-03-24 13:21:38.871638371 +0100 -@@ -58,6 +58,27 @@ - #define __DOTS , ... - #define __THROW - -+/* -+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g. -+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. -+ * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI -+ * mode -- there must be no spaces between its arguments, and for nested -+ * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also -+ * concatenate double-quoted strings produced by the __STRING macro, but -+ * this only works with ANSI C. -+ * -+ * __XSTRING is like __STRING, but it expands any macros in its argument -+ * first. It is only available with ANSI C. -+ */ -+#define __CONCAT1(x,y) x ## y -+#define __CONCAT(x,y) __CONCAT1(x,y) -+#define __STRING(x) #x /* stringify without expanding x */ -+#define __XSTRING(x) __STRING(x) /* expand x, then stringify */ -+ -+#ifdef __GNUC__ -+# define __ASMNAME(cname) __XSTRING (__USER_LABEL_PREFIX__) cname -+#endif -+ - #define __ptr_t void * - #define __long_double_t long double - -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h 2010-01-14 19:49:13.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h 2011-03-24 13:21:38.871638371 +0100 -@@ -51,8 +51,6 @@ - #define O_BINARY _FBINARY - #define O_TEXT _FTEXT - #define O_NOINHERIT _FNOINHERIT --/* O_CLOEXEC is the Linux equivalent to O_NOINHERIT */ --#define O_CLOEXEC _FNOINHERIT - - /* The windows header files define versions with a leading underscore. */ - #define _O_RDONLY O_RDONLY -@@ -124,9 +122,6 @@ - #define F_CNVT 12 /* Convert a fhandle to an open fd */ - #define F_RSETLKW 13 /* Set or Clear remote record-lock(Blocking) */ - #endif /* !_POSIX_SOURCE */ --#ifdef __CYGWIN__ --#define F_DUPFD_CLOEXEC 14 /* As F_DUPFD, but set close-on-exec flag */ --#endif - - /* fcntl(2) flags (l_type field of flock structure) */ - #define F_RDLCK 1 /* read lock */ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/dir.h newlib-1.19.0/newlib/libc/include/sys/dir.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/dir.h 2010-08-11 20:14:54.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/dir.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,10 +0,0 @@ --/* BSD predecessor of POSIX.1 <dirent.h> and struct dirent */ -- --#ifndef _SYS_DIR_H_ --#define _SYS_DIR_H_ -- --#include <dirent.h> -- --#define direct dirent -- --#endif /*_SYS_DIR_H_*/ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/features.h newlib-1.19.0/newlib/libc/include/sys/features.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/features.h 2010-08-09 10:29:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/features.h 2011-03-24 13:21:38.874638418 +0100 -@@ -15,7 +15,7 @@ - * OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS - * SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - * -- * $Id$ -+ * $Id$ - */ - - #ifndef _SYS_FEATURES_H -@@ -178,6 +178,12 @@ - /* #define _XOPEN_UNIX -1 */ - - #endif /* !__STRICT_ANSI__ || __cplusplus || __STDC_VERSION__ >= 199901L */ -+ -+/* The value corresponds to UNICODE version 4.0, which is the version -+ supported by XP. Newlib supports 5.2 (2011) but so far Cygwin needs -+ the MS conversions for double-byte charsets. */ -+#define __STDC_ISO_10646__ 200305L -+ - #endif /* __CYGWIN__ */ - - /* Per the permission given in POSIX.1-2008 section 2.2.1, define -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/types.h newlib-1.19.0/newlib/libc/include/sys/types.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/types.h 2010-12-08 15:44:06.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/sys/types.h 2011-03-24 13:21:38.875638433 +0100 -@@ -98,6 +98,7 @@ - - typedef unsigned short ushort; /* System V compatibility */ - typedef unsigned int uint; /* System V compatibility */ -+typedef unsigned long ulong; /* System V compatibility */ - # endif /*!_POSIX_SOURCE */ - - #ifndef __clock_t_defined -diff -Naur newlib-1.19.0.orig/newlib/libc/include/wchar.h newlib-1.19.0/newlib/libc/include/wchar.h ---- newlib-1.19.0.orig/newlib/libc/include/wchar.h 2009-10-15 10:23:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/wchar.h 2011-03-24 13:21:38.875638433 +0100 -@@ -16,6 +16,9 @@ - /* For _mbstate_t definition. */ - #include <sys/_types.h> - -+/* For __STDC_ISO_10646__ */ -+#include <sys/features.h> -+ - #ifndef NULL - #define NULL 0 - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S ---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S 2010-02-08 18:24:22.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S 2011-03-24 13:21:38.875638433 +0100 -@@ -15,7 +15,7 @@ - - #include "m68kasm.h" - --#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__) -+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__) - # define MISALIGNED_OK 1 - #else - # define MISALIGNED_OK 0 -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c newlib-1.19.0/newlib/libc/machine/mips/strlen.c ---- newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c 2002-03-14 03:41:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/mips/strlen.c 2011-03-24 13:21:38.875638433 +0100 -@@ -60,6 +60,9 @@ - " addiu $2,$4,1\n" - "\n" - "1: lbu $3,0($4)\n" -+#if defined(_R3000) -+ " nop \n" -+#endif - " bnez $3,1b\n" - " addiu $4,$4,1\n" - "\n" -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am 2007-05-24 19:33:35.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am 2011-03-24 13:21:38.875638433 +0100 -@@ -10,7 +10,7 @@ - - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib - --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS=$(AM_CCASFLAGS) - lib_a_CFLAGS=$(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in 2010-12-16 22:58:53.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in 2011-03-24 13:21:38.875638433 +0100 -@@ -51,7 +51,7 @@ - LIBRARIES = $(noinst_LIBRARIES) - ARFLAGS = cru - lib_a_AR = $(AR) $(ARFLAGS) --am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT) -+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) - lib_a_OBJECTS = $(am_lib_a_OBJECTS) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = -@@ -174,7 +174,7 @@ - AM_CCASFLAGS = $(INCLUDES) - noinst_LIBRARIES = lib.a - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS = $(AM_CCASFLAGS) - lib_a_CFLAGS = $(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -@@ -185,7 +185,7 @@ - all: all-am - - .SUFFIXES: --.SUFFIXES: .S .c .o .obj -+.SUFFIXES: .S .o .obj - am--refresh: - @: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -@@ -246,18 +246,6 @@ - lib_a-setjmp.obj: setjmp.S - $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi` - --.c.o: -- $(COMPILE) -c $< -- --.c.obj: -- $(COMPILE) -c `$(CYGPATH_W) '$<'` -- --lib_a-times.o: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c -- --lib_a-times.obj: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi` -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.19.0/newlib/libc/machine/powerpc/times.c ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c 2002-07-22 22:26:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/times.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,36 +0,0 @@ --/* Time support routines for PowerPC. -- * -- * Written by Aldy Hernandez. -- */ -- --#include <_ansi.h> --#include <reent.h> --#include <sys/time.h> --#include <sys/times.h> --#include <sys/resource.h> -- --clock_t --times (struct tms *tp) --{ -- struct rusage usage; -- union { -- struct rusage r; -- /* Newlib's rusage has only 2 fields. We need to make room for -- when we call the system's rusage. This should be enough. */ -- int filler[32]; -- } host_ru; -- -- getrusage (RUSAGE_SELF, (void *)&host_ru); -- -- if (tp) -- { -- tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000 -- + host_ru.r.ru_utime.tv_usec; -- tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000 -- + host_ru.r.ru_stime.tv_usec; -- tp->tms_cutime = 0; /* user time, children */ -- tp->tms_cstime = 0; /* system time, children */ -- } -- -- return tp->tms_utime; --} -diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.am newlib-1.19.0/newlib/libc/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/Makefile.am 2010-05-07 01:25:16.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/Makefile.am 2011-03-24 13:21:38.865638281 +0100 -@@ -36,6 +36,8 @@ - - if HAVE_XDR_DIR - XDR_SUBDIR = xdr -+rpcincludedir = $(tooldir) -+nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h - endif - - # The order of SUBDIRS is important for the integrated documentation. -@@ -140,8 +142,7 @@ - locale/stmp-def \ - reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ -- misc/stmp-def \ -- posix/stmp-def -+ misc/stmp-def - - libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) -diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.in newlib-1.19.0/newlib/libc/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/Makefile.in 2010-12-16 22:58:39.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/Makefile.in 2011-03-24 13:21:38.866638296 +0100 -@@ -17,6 +17,7 @@ - - - -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -39,7 +40,8 @@ - subdir = . - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ -- $(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) -+ $(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) \ -+ $(am__nobase_rpcinclude_HEADERS_DIST) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ - $(top_srcdir)/../../ltoptions.m4 \ -@@ -155,6 +157,10 @@ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - DATA = $(noinst_DATA) -+am__nobase_rpcinclude_HEADERS_DIST = include/rpc/xdr.h \ -+ include/rpc/types.h -+am__installdirs = "$(DESTDIR)$(rpcincludedir)" -+HEADERS = $(nobase_rpcinclude_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -319,6 +325,8 @@ - @ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_LIBS = - @ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext) - @HAVE_XDR_DIR_TRUE@XDR_SUBDIR = xdr -+@HAVE_XDR_DIR_TRUE@rpcincludedir = $(tooldir) -+@HAVE_XDR_DIR_TRUE@nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h - - # The order of SUBDIRS is important for the integrated documentation. - # Do not change the order without considering the doc impact. -@@ -396,8 +404,7 @@ - locale/stmp-def \ - reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ -- misc/stmp-def \ -- posix/stmp-def -+ misc/stmp-def - - info_TEXINFOS = libc.texinfo - libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \ -@@ -638,6 +645,29 @@ - done - - clean-info: mostlyclean-aminfo clean-aminfo -+install-nobase_rpcincludeHEADERS: $(nobase_rpcinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ test -z "$(rpcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)" -+ @list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \ -+ $(am__nobase_list) | while read dir files; do \ -+ xfiles=; for file in $$files; do \ -+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \ -+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ -+ test -z "$$xfiles" || { \ -+ test "x$$dir" = x. || { \ -+ echo "$(MKDIR_P) '$(DESTDIR)$(rpcincludedir)/$$dir'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)/$$dir"; }; \ -+ echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(rpcincludedir)/$$dir'"; \ -+ $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(rpcincludedir)/$$dir" || exit $$?; }; \ -+ done -+ -+uninstall-nobase_rpcincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \ -+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ -+ test -n "$$files" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(rpcincludedir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(rpcincludedir)" && rm -f $$files - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. -@@ -775,9 +805,12 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - check-am: - check: check-recursive --all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) -+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: -+ for dir in "$(DESTDIR)$(rpcincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -827,7 +860,7 @@ - - info-am: $(INFO_DEPS) - --install-data-am: -+install-data-am: install-nobase_rpcincludeHEADERS - - install-dvi: install-dvi-recursive - -@@ -952,7 +985,8 @@ - ps-am: $(PSS) - - uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ -- uninstall-pdf-am uninstall-ps-am -+ uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \ -+ uninstall-ps-am - - .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive -@@ -966,14 +1000,16 @@ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -- maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ -- mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ -- uninstall-info-am uninstall-pdf-am uninstall-ps-am -+ install-man install-nobase_rpcincludeHEADERS install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-aminfo \ -+ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-dvi-am uninstall-html-am uninstall-info-am \ -+ uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \ -+ uninstall-ps-am - - @USE_LIBTOOL_FALSE@libc.a: $(SUBLIBS) - @USE_LIBTOOL_FALSE@ rm -f $@ -diff -Naur newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c newlib-1.19.0/newlib/libc/misc/__dprintf.c ---- newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c 2008-12-11 18:27:55.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/misc/__dprintf.c 2011-03-24 13:21:38.876638448 +0100 -@@ -5,6 +5,7 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include "ctype.h" - #include "reent.h" - #include "string.h" -@@ -131,7 +132,7 @@ - write_string (unctrl (c)); - break; - case 'p' : -- l = (_POINTER_INT) va_arg (args, char *); -+ l = (intptr_t) va_arg (args, char *); - print_number (16, 1, l); - break; - case 'd' : -diff -Naur newlib-1.19.0.orig/newlib/libc/misc/ffs.c newlib-1.19.0/newlib/libc/misc/ffs.c ---- newlib-1.19.0.orig/newlib/libc/misc/ffs.c 2003-06-06 21:57:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/misc/ffs.c 2011-03-24 13:21:38.876638448 +0100 -@@ -6,9 +6,11 @@ - ffs - - ANSI_SYNOPSIS -+ #include <strings.h> - int ffs(int <[word]>); - - TRAD_SYNOPSIS -+ #include <strings.h> - int ffs(<[word]>); - - DESCRIPTION -@@ -24,7 +26,7 @@ - - No supporting OS subroutines are required. */ - --#include <_ansi.h> -+#include <strings.h> - - int - _DEFUN(ffs, (word), -diff -Naur newlib-1.19.0.orig/newlib/libc/posix/readdir.c newlib-1.19.0/newlib/libc/posix/readdir.c ---- newlib-1.19.0.orig/newlib/libc/posix/readdir.c 2003-06-06 21:57:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/posix/readdir.c 2011-03-24 13:21:38.876638448 +0100 -@@ -37,6 +37,7 @@ - static char sccsid[] = "@(#)readdir.c 5.7 (Berkeley) 6/1/90"; - #endif /* LIBC_SCCS and not lint */ - -+#include <stdint.h> - #include <dirent.h> - - extern int getdents (int fd, void *dp, int count); -@@ -75,7 +76,7 @@ - continue; - } - dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc); -- if ((int)dp & 03) { /* bogus pointer check */ -+ if ((intptr_t)dp & 03) { /* bogus pointer check */ - #ifdef HAVE_DD_LOCK - __lock_release_recursive(dirp->dd_lock); - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/search/db_local.h newlib-1.19.0/newlib/libc/search/db_local.h ---- newlib-1.19.0.orig/newlib/libc/search/db_local.h 2010-03-05 09:55:15.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/search/db_local.h 2011-03-24 13:21:38.876638448 +0100 -@@ -102,11 +102,11 @@ - typedef struct __db { - DBTYPE type; /* Underlying db type. */ - int (*close)(struct __db *); -- int (*del)(const struct __db *, const DBT *, u_int); -- int (*get)(const struct __db *, const DBT *, DBT *, u_int); -- int (*put)(const struct __db *, DBT *, const DBT *, u_int); -- int (*seq)(const struct __db *, DBT *, DBT *, u_int); -- int (*sync)(const struct __db *, u_int); -+ int (*del)(const struct __db *, const DBT *, __uint32_t); -+ int (*get)(const struct __db *, const DBT *, DBT *, __uint32_t); -+ int (*put)(const struct __db *, DBT *, const DBT *, __uint32_t); -+ int (*seq)(const struct __db *, DBT *, DBT *, __uint32_t); -+ int (*sync)(const struct __db *, __uint32_t); - void *internal; /* Access method private. */ - int (*fd)(const struct __db *); - } DB; -diff -Naur newlib-1.19.0.orig/newlib/libc/search/extern.h newlib-1.19.0/newlib/libc/search/extern.h ---- newlib-1.19.0.orig/newlib/libc/search/extern.h 2002-06-20 21:51:31.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/extern.h 2011-03-24 13:21:38.876638448 +0100 -@@ -43,7 +43,7 @@ - int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, __uint32_t, SPLIT_RETURN *); - int __buf_free(HTAB *, int, int); --void __buf_init(HTAB *, int); -+void __buf_init(HTAB *, __uint32_t); - __uint32_t __call_hash(HTAB *, char *, int); - int __delpair(HTAB *, BUFHEAD *, int); - int __expand_table(HTAB *); -diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash_buf.c newlib-1.19.0/newlib/libc/search/hash_buf.c ---- newlib-1.19.0.orig/newlib/libc/search/hash_buf.c 2004-05-26 19:57:10.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/hash_buf.c 2011-03-24 13:21:38.877638463 +0100 -@@ -118,7 +118,7 @@ - int newpage; /* If prev_bp set, indicates a new overflow page. */ - { - BUFHEAD *bp; -- __uint32_t is_disk_mask; -+ ptrdiff_t is_disk_mask; - int is_disk, segment_ndx; - SEGMENT segp; - -@@ -298,7 +298,7 @@ - extern void - __buf_init(hashp, nbytes) - HTAB *hashp; -- int nbytes; -+ __uint32_t nbytes; - { - BUFHEAD *bfp; - int npages; -diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash.h newlib-1.19.0/newlib/libc/search/hash.h ---- newlib-1.19.0.orig/newlib/libc/search/hash.h 2008-07-02 20:38:45.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/hash.h 2011-03-24 13:21:38.876638448 +0100 -@@ -82,7 +82,7 @@ - - /* Hash Table Information */ - typedef struct hashhdr { /* Disk resident portion */ -- int magic; /* Magic NO for hash tables */ -+ __uint32_t magic; /* Magic NO for hash tables */ - int version; /* Version ID */ - __uint32_t lorder; /* Byte Order */ - int bsize; /* Bucket/Page Size */ -@@ -97,7 +97,7 @@ - int high_mask; /* Mask to modulo into entire table */ - int low_mask; /* Mask to modulo into lower half of - * table */ -- int ffactor; /* Fill factor */ -+ __uint32_t ffactor; /* Fill factor */ - int nkeys; /* Number of keys in hash table */ - int hdrpages; /* Size of table header */ - int h_charkey; /* value of hash(CHARKEY) */ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fclose.c newlib-1.19.0/newlib/libc/stdio/fclose.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fclose.c 2007-07-13 22:37:53.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fclose.c 2011-03-24 13:21:38.877638463 +0100 -@@ -74,8 +74,6 @@ - if (fp == NULL) - return (0); /* on NULL */ - -- __sfp_lock_acquire (); -- - CHECK_INIT (rptr, fp); - - _flockfile (fp); -@@ -83,7 +81,6 @@ - if (fp->_flags == 0) /* not open! */ - { - _funlockfile (fp); -- __sfp_lock_release (); - return (0); - } - /* Unconditionally flush to allow special handling for seekable read -@@ -98,6 +95,7 @@ - FREEUB (rptr, fp); - if (HASLB (fp)) - FREELB (rptr, fp); -+ __sfp_lock_acquire (); - fp->_flags = 0; /* release this FILE for reuse */ - _funlockfile (fp); - #ifndef __SINGLE_THREAD__ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fflush.c newlib-1.19.0/newlib/libc/stdio/fflush.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fflush.c 2009-10-30 09:26:41.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fflush.c 2011-03-24 13:21:38.877638463 +0100 -@@ -67,37 +67,16 @@ - - /* Flush a single file, or (if fp is NULL) all files. */ - -+/* Core function which does not lock file pointer. This gets called -+ directly from __srefill. */ - int --_DEFUN(_fflush_r, (ptr, fp), -+_DEFUN(__sflush_r, (ptr, fp), - struct _reent *ptr _AND - register FILE * fp) - { - register unsigned char *p; - register int n, t; - --#ifdef _REENT_SMALL -- /* For REENT_SMALL platforms, it is possible we are being -- called for the first time on a std stream. This std -- stream can belong to a reentrant struct that is not -- _REENT. If CHECK_INIT gets called below based on _REENT, -- we will end up changing said file pointers to the equivalent -- std stream off of _REENT. This causes unexpected behavior if -- there is any data to flush on the _REENT std stream. There -- are two alternatives to fix this: 1) make a reentrant fflush -- or 2) simply recognize that this file has nothing to flush -- and return immediately before performing a CHECK_INIT. Choice -- 2 is implemented here due to its simplicity. */ -- if (fp->_bf._base == NULL) -- return 0; --#endif /* _REENT_SMALL */ -- -- CHECK_INIT (ptr, fp); -- -- if (!fp->_flags) -- return 0; -- -- _flockfile (fp); -- - t = fp->_flags; - if ((t & __SWR) == 0) - { -@@ -150,7 +129,6 @@ - } - else - fp->_flags |= __SERR; -- _funlockfile (fp); - return result; - } - } -@@ -186,17 +164,14 @@ - else - { - fp->_flags |= __SERR; -- _funlockfile (fp); - return EOF; - } - } -- _funlockfile (fp); - return 0; - } - if ((p = fp->_bf._base) == NULL) - { - /* Nothing to flush. */ -- _funlockfile (fp); - return 0; - } - n = fp->_p - p; /* write this much */ -@@ -215,16 +190,48 @@ - if (t <= 0) - { - fp->_flags |= __SERR; -- _funlockfile (fp); - return EOF; - } - p += t; - n -= t; - } -- _funlockfile (fp); - return 0; - } - -+int -+_DEFUN(_fflush_r, (ptr, fp), -+ struct _reent *ptr _AND -+ register FILE * fp) -+{ -+ int ret; -+ -+#ifdef _REENT_SMALL -+ /* For REENT_SMALL platforms, it is possible we are being -+ called for the first time on a std stream. This std -+ stream can belong to a reentrant struct that is not -+ _REENT. If CHECK_INIT gets called below based on _REENT, -+ we will end up changing said file pointers to the equivalent -+ std stream off of _REENT. This causes unexpected behavior if -+ there is any data to flush on the _REENT std stream. There -+ are two alternatives to fix this: 1) make a reentrant fflush -+ or 2) simply recognize that this file has nothing to flush -+ and return immediately before performing a CHECK_INIT. Choice -+ 2 is implemented here due to its simplicity. */ -+ if (fp->_bf._base == NULL) -+ return 0; -+#endif /* _REENT_SMALL */ -+ -+ CHECK_INIT (ptr, fp); -+ -+ if (!fp->_flags) -+ return 0; -+ -+ _flockfile (fp); -+ ret = __sflush_r (ptr, fp); -+ _funlockfile (fp); -+ return ret; -+} -+ - #ifndef _REENT_ONLY - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c newlib-1.19.0/newlib/libc/stdio/fgetc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c 2009-04-25 00:52:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetc.c 2011-03-24 13:21:38.877638463 +0100 -@@ -93,11 +93,9 @@ - #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) - int result; - CHECK_INIT(_REENT, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (_REENT, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - #else - return _fgetc_r (_REENT, fp); -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgets.c newlib-1.19.0/newlib/libc/stdio/fgets.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgets.c 2009-04-25 00:52:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgets.c 2011-03-24 13:21:38.877638463 +0100 -@@ -98,7 +98,6 @@ - - CHECK_INIT(ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - #ifdef __SCLE - if (fp->_flags & __SCLE) -@@ -114,12 +113,10 @@ - if (c == EOF && s == buf) - { - _funlockfile (fp); -- __sfp_lock_release (); - return NULL; - } - *s = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return buf; - } - #endif -@@ -138,7 +135,6 @@ - if (s == buf) - { - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - break; -@@ -164,7 +160,6 @@ - _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); - s[len] = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return (buf); - } - fp->_r -= len; -@@ -175,7 +170,6 @@ - while ((n -= len) != 0); - *s = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return buf; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c newlib-1.19.0/newlib/libc/stdio/fgetwc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetwc.c 2011-03-24 13:21:38.878638478 +0100 -@@ -164,12 +164,10 @@ - { - wint_t r; - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT(fp, 1); - r = __fgetwc (ptr, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return r; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c newlib-1.19.0/newlib/libc/stdio/fgetws.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetws.c 2011-03-24 13:21:38.878638478 +0100 -@@ -93,7 +93,6 @@ - const char *src; - unsigned char *nl; - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT (fp, 1); - -@@ -144,12 +143,10 @@ - goto error; - *wsp++ = L'\0'; - _funlockfile (fp); -- __sfp_lock_release (); - return ws; - - error: - _funlockfile (fp); -- __sfp_lock_release (); - return NULL; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c newlib-1.19.0/newlib/libc/stdio/fmemopen.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c 2007-08-02 22:23:06.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fmemopen.c 2011-03-24 13:21:38.878638478 +0100 -@@ -281,7 +281,7 @@ - - if ((flags = __sflags (ptr, mode, &dummy)) == 0) - return NULL; -- if (!size || !(buf || flags & __SAPP)) -+ if (!size || !(buf || flags & __SRW)) - { - ptr->_errno = EINVAL; - return NULL; -@@ -310,7 +310,7 @@ - { - /* r+/w+/a+, and no buf: file starts empty. */ - c->buf = (char *) (c + 1); -- *(char *) buf = '\0'; -+ c->buf[0] = '\0'; - c->pos = c->eof = 0; - c->append = (flags & __SAPP) != 0; - } -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fread.c newlib-1.19.0/newlib/libc/stdio/fread.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fread.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fread.c 2011-03-24 13:21:38.878638478 +0100 -@@ -146,7 +146,6 @@ - - CHECK_INIT(ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT (fp, -1); - if (fp->_r < 0) -@@ -197,12 +196,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r (ptr, fp, buf, total-resid, 1) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return (total - resid) / size; - } - } -@@ -224,12 +221,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r (ptr, fp, buf, total-resid, 1) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return (total - resid) / size; - } - } -@@ -243,12 +238,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r(ptr, fp, buf, total, 0) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return count; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/freopen.c newlib-1.19.0/newlib/libc/stdio/freopen.c ---- newlib-1.19.0.orig/newlib/libc/stdio/freopen.c 2008-12-12 16:45:19.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/freopen.c 2011-03-24 13:21:38.878638478 +0100 -@@ -98,8 +98,6 @@ - int flags, oflags; - int e = 0; - -- __sfp_lock_acquire (); -- - CHECK_INIT (ptr, fp); - - _flockfile (fp); -@@ -108,7 +106,6 @@ - { - _funlockfile (fp); - _fclose_r (ptr, fp); -- __sfp_lock_release (); - return NULL; - } - -@@ -208,6 +205,7 @@ - - if (f < 0) - { /* did not get it after all */ -+ __sfp_lock_acquire (); - fp->_flags = 0; /* set it free */ - ptr->_errno = e; /* restore in case _close clobbered */ - _funlockfile (fp); -@@ -232,7 +230,6 @@ - #endif - - _funlockfile (fp); -- __sfp_lock_release (); - return fp; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fseek.c newlib-1.19.0/newlib/libc/stdio/fseek.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fseek.c 2009-12-17 20:43:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fseek.c 2011-03-24 13:21:38.879638493 +0100 -@@ -138,7 +138,6 @@ - - CHECK_INIT (ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - - /* If we've been doing some writing, and we're in append mode -@@ -156,7 +155,6 @@ - { - ptr->_errno = ESPIPE; /* ??? */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - -@@ -182,7 +180,6 @@ - if (curoff == -1L) - { - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - } -@@ -208,7 +205,6 @@ - default: - ptr->_errno = EINVAL; - _funlockfile (fp); -- __sfp_lock_release (); - return (EOF); - } - -@@ -268,7 +264,6 @@ - { - ptr->_errno = EOVERFLOW; - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - -@@ -325,7 +320,6 @@ - fp->_flags &= ~__SEOF; - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - -@@ -356,7 +350,6 @@ - } - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - - /* -@@ -369,7 +362,6 @@ - || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR) - { - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - /* success: clear EOF indicator and discard ungetc() data */ -@@ -388,7 +380,6 @@ - fp->_flags &= ~__SNPT; - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c newlib-1.19.0/newlib/libc/stdio/fwalk.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c 2009-01-12 23:19:11.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fwalk.c 2011-03-24 13:21:38.879638493 +0100 -@@ -27,8 +27,8 @@ - #include <errno.h> - #include "local.h" - --static int --_DEFUN(__fwalk, (ptr, function), -+int -+_DEFUN(_fwalk, (ptr, function), - struct _reent *ptr _AND - register int (*function) (FILE *)) - { -@@ -36,11 +36,19 @@ - register int n, ret = 0; - register struct _glue *g; - -+ /* -+ * It should be safe to walk the list without locking it; -+ * new nodes are only added to the end and none are ever -+ * removed. -+ * -+ * Avoid locking this list while walking it or else you will -+ * introduce a potential deadlock in [at least] refill.c. -+ */ - for (g = &ptr->__sglue; g != NULL; g = g->_next) - for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++) - if (fp->_flags != 0) - { -- if (fp->_flags != 0 && fp->_file != -1) -+ if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1) - ret |= (*function) (fp); - } - -@@ -49,8 +57,8 @@ - - /* Special version of __fwalk where the function pointer is a reentrant - I/O function (e.g. _fclose_r). */ --static int --_DEFUN(__fwalk_reent, (ptr, reent_function), -+int -+_DEFUN(_fwalk_reent, (ptr, reent_function), - struct _reent *ptr _AND - register int (*reent_function) (struct _reent *, FILE *)) - { -@@ -58,51 +66,21 @@ - register int n, ret = 0; - register struct _glue *g; - -+ /* -+ * It should be safe to walk the list without locking it; -+ * new nodes are only added to the end and none are ever -+ * removed. -+ * -+ * Avoid locking this list while walking it or else you will -+ * introduce a potential deadlock in [at least] refill.c. -+ */ - for (g = &ptr->__sglue; g != NULL; g = g->_next) - for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++) - if (fp->_flags != 0) - { -- if (fp->_flags != 0 && fp->_file != -1) -+ if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1) - ret |= (*reent_function) (ptr, fp); - } - - return ret; - } -- --int --_DEFUN(_fwalk, (ptr, function), -- struct _reent *ptr _AND -- register int (*function)(FILE *)) --{ -- register int ret = 0; -- -- __sfp_lock_acquire (); -- -- /* Must traverse given list for streams. Note that _GLOBAL_REENT -- only walked once in exit(). */ -- ret |= __fwalk (ptr, function); -- -- __sfp_lock_release (); -- -- return ret; --} -- --/* Special version of _fwalk which handles a function pointer to a -- reentrant I/O function (e.g. _fclose_r). */ --int --_DEFUN(_fwalk_reent, (ptr, reent_function), -- struct _reent *ptr _AND -- register int (*reent_function) (struct _reent *, FILE *)) --{ -- register int ret = 0; -- -- __sfp_lock_acquire (); -- -- /* Must traverse given list for streams. Note that _GLOBAL_REENT -- only walked once in exit(). */ -- ret |= __fwalk_reent (ptr, reent_function); -- -- __sfp_lock_release (); -- -- return ret; --} -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getc.c newlib-1.19.0/newlib/libc/stdio/getc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/getc.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/getc.c 2011-03-24 13:21:38.879638493 +0100 -@@ -92,11 +92,9 @@ - { - int result; - CHECK_INIT (ptr, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (ptr, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - } - -@@ -108,11 +106,9 @@ - { - int result; - CHECK_INIT (_REENT, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (_REENT, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c newlib-1.19.0/newlib/libc/stdio/getdelim.c ---- newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/getdelim.c 2011-03-24 13:21:38.879638493 +0100 -@@ -81,7 +81,6 @@ - - CHECK_INIT (_REENT, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - - numbytes = *n; -@@ -131,7 +130,6 @@ - } - - _funlockfile (fp); -- __sfp_lock_release (); - - /* if no input data, return failure */ - if (ptr == buf) -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/gets.c newlib-1.19.0/newlib/libc/stdio/gets.c ---- newlib-1.19.0.orig/newlib/libc/stdio/gets.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/gets.c 2011-03-24 13:21:38.879638493 +0100 -@@ -79,14 +79,12 @@ - register int c; - register char *s = buf; - -- __sfp_lock_acquire (); - _flockfile (stdin); - while ((c = __sgetc_r (ptr, stdin)) != '\n') - if (c == EOF) - if (s == buf) - { - _funlockfile (stdin); -- __sfp_lock_release (); - return NULL; - } - else -@@ -95,7 +93,6 @@ - *s++ = c; - *s = 0; - _funlockfile (stdin); -- __sfp_lock_release (); - return buf; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/local.h newlib-1.19.0/newlib/libc/stdio/local.h ---- newlib-1.19.0.orig/newlib/libc/stdio/local.h 2009-04-22 10:30:03.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/local.h 2011-03-24 13:21:38.879638493 +0100 -@@ -54,6 +54,7 @@ - va_list)); - extern FILE *_EXFUN(__sfp,(struct _reent *)); - extern int _EXFUN(__sflags,(struct _reent *,_CONST char*, int*)); -+extern int _EXFUN(__sflush_r,(struct _reent *,FILE *)); - extern int _EXFUN(__srefill_r,(struct _reent *,FILE *)); - extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *, - int)); -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c newlib-1.19.0/newlib/libc/stdio/open_memstream.c ---- newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c 2009-02-25 05:00:05.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/open_memstream.c 2011-03-24 13:21:38.880638508 +0100 -@@ -330,8 +330,10 @@ - c->max *= sizeof(wchar_t); - if (c->max < 64) - c->max = 64; -- else if (c->max > 64 * 1024) -- c->max = 64 * 1024; -+#if (SIZE_MAX >= 0x10000) -+ else if (c->max > 0x10000) -+ c->max = 0x10000; -+#endif - *size = 0; - *buf = _malloc_r (ptr, c->max); - if (!*buf) -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/refill.c newlib-1.19.0/newlib/libc/stdio/refill.c ---- newlib-1.19.0.orig/newlib/libc/stdio/refill.c 2008-12-11 00:43:12.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/refill.c 2011-03-24 13:21:38.880638508 +0100 -@@ -102,9 +102,19 @@ - * flush all line buffered output files, per the ANSI C - * standard. - */ -- - if (fp->_flags & (__SLBF | __SNBF)) -- _CAST_VOID _fwalk (_GLOBAL_REENT, lflush); -+ { -+ /* Ignore this file in _fwalk to avoid potential deadlock. */ -+ short orig_flags = fp->_flags; -+ fp->_flags = 1; -+ _CAST_VOID _fwalk (_GLOBAL_REENT, lflush); -+ fp->_flags = orig_flags; -+ -+ /* Now flush this file without locking it. */ -+ if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) -+ __sflush_r (ptr, fp); -+ } -+ - fp->_p = fp->_bf._base; - fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size); - #ifndef __CYGWIN__ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c newlib-1.19.0/newlib/libc/stdio/tmpnam.c ---- newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c 2004-04-23 22:01:55.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/tmpnam.c 2011-03-24 13:21:38.880638508 +0100 -@@ -94,6 +94,7 @@ - #include <_ansi.h> - #include <reent.h> - #include <stdio.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <fcntl.h> -@@ -109,7 +110,7 @@ - char *result _AND - _CONST char *part1 _AND - _CONST char *part2 _AND -- int part3 _AND -+ intptr_t part3 _AND - int *part4) - { - /* Generate the filename and make sure that there isn't one called -@@ -183,7 +184,7 @@ - if (filename) - { - if (! worker (p, filename, dir, prefix, -- _getpid_r (p) ^ (int) (_POINTER_INT) p, &p->_inc)) -+ _getpid_r (p) ^ (intptr_t) p, &p->_inc)) - return NULL; - } - return filename; -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c newlib-1.19.0/newlib/libc/stdio/vfscanf.c ---- newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c 2010-01-20 00:16:45.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/vfscanf.c 2011-03-24 13:21:38.880638508 +0100 -@@ -494,7 +494,6 @@ - # define GET_ARG(n, ap, type) (va_arg (ap, type)) - #endif - -- __sfp_lock_acquire (); - _flockfile (fp); - - ORIENT (fp, -1); -@@ -795,7 +794,6 @@ - */ - case '\0': /* compat */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - - default: /* compat */ -@@ -1596,13 +1594,11 @@ - invalid format string), return EOF if no matches yet, else number - of matches made prior to failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF; - match_failure: - all_done: - /* Return number of matches, which can be 0 on match failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c newlib-1.19.0/newlib/libc/stdio/vfwscanf.c ---- newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c 2009-03-11 12:53:22.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/vfwscanf.c 2011-03-24 13:21:38.881638523 +0100 -@@ -434,7 +434,6 @@ - # define GET_ARG(n, ap, type) (va_arg (ap, type)) - #endif - -- __sfp_lock_acquire (); - _flockfile (fp); - - ORIENT (fp, 1); -@@ -714,7 +713,6 @@ - */ - case L'\0': /* compat */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - - default: /* compat */ -@@ -1443,13 +1441,11 @@ - invalid format string), return EOF if no matches yet, else number - of matches made prior to failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF; - match_failure: - all_done: - /* Return number of matches, which can be 0 on match failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c newlib-1.19.0/newlib/libc/stdio64/freopen64.c ---- newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c 2007-07-13 22:37:53.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio64/freopen64.c 2011-03-24 13:21:38.881638523 +0100 -@@ -97,7 +97,6 @@ - int flags, oflags; - int e = 0; - -- __sfp_lock_acquire (); - - CHECK_INIT (ptr, fp); - -@@ -107,7 +106,6 @@ - { - _funlockfile(fp); - _fclose_r (ptr, fp); -- __sfp_lock_release (); - return NULL; - } - -@@ -204,6 +202,7 @@ - - if (f < 0) - { /* did not get it after all */ -+ __sfp_lock_acquire (); - fp->_flags = 0; /* set it free */ - ptr->_errno = e; /* restore in case _close clobbered */ - _funlockfile(fp); -@@ -231,7 +230,6 @@ - fp->_flags |= __SL64; - - _funlockfile(fp); -- __sfp_lock_release (); - return fp; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atof.c newlib-1.19.0/newlib/libc/stdlib/atof.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/atof.c 2003-10-20 20:46:37.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdlib/atof.c 2011-03-24 13:21:38.883638553 +0100 -@@ -1,6 +1,6 @@ - /* - FUNCTION -- <<atof>>, <<atoff>>---string to double or float -+ <<atof>> ---string to double - - INDEX - atof -@@ -10,19 +10,14 @@ - ANSI_SYNOPSIS - #include <stdlib.h> - double atof(const char *<[s]>); -- float atoff(const char *<[s]>); - - TRAD_SYNOPSIS - #include <stdlib.h> - double atof(<[s]>) - char *<[s]>; - -- float atoff(<[s]>) -- char *<[s]>; -- - DESCRIPTION - <<atof>> converts the initial portion of a string to a <<double>>. --<<atoff>> converts the initial portion of a string to a <<float>>. - - The functions parse the character string <[s]>, - locating a substring which can be converted to a floating-point -@@ -36,7 +31,6 @@ - something other than <<+>>, <<->>, <<.>>, or a digit. - - <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>. --<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>. - - RETURNS - <<atof>> returns the converted substring value, if any, as a -@@ -47,12 +41,9 @@ - If the correct value would cause underflow, <<0.0>> is returned - and <<ERANGE>> is stored in <<errno>>. - --<<atoff>> obeys the same rules as <<atof>>, except that it --returns a <<float>>. -- - PORTABILITY --<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strod>> --and <<strol>>, but are used extensively in existing code. These functions are -+<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strtod>> -+and <<strtol>>, but are used extensively in existing code. These functions are - less reliable, but may be faster if the argument is verified to be in a valid - range. - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c newlib-1.19.0/newlib/libc/stdlib/atoff.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c 2002-12-06 19:58:51.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/atoff.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,9 +0,0 @@ --#include <stdlib.h> --#include <_ansi.h> -- --float --_DEFUN (atoff, (s), -- _CONST char *s) --{ -- return strtof (s, NULL); --} -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am newlib-1.19.0/newlib/libc/stdlib/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am 2009-04-16 20:24:35.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.am 2011-03-24 13:21:38.881638523 +0100 -@@ -16,7 +16,6 @@ - assert.c \ - atexit.c \ - atof.c \ -- atoff.c \ - atoi.c \ - atol.c \ - calloc.c \ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in newlib-1.19.0/newlib/libc/stdlib/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in 2010-12-16 22:59:03.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.in 2011-03-24 13:21:38.883638553 +0100 -@@ -69,8 +69,7 @@ - lib_a-__ten_mu.$(OBJEXT) lib_a-_Exit.$(OBJEXT) \ - lib_a-abort.$(OBJEXT) lib_a-abs.$(OBJEXT) \ - lib_a-assert.$(OBJEXT) lib_a-atexit.$(OBJEXT) \ -- lib_a-atof.$(OBJEXT) lib_a-atoff.$(OBJEXT) \ -- lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \ -+ lib_a-atof.$(OBJEXT) lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \ - lib_a-calloc.$(OBJEXT) lib_a-div.$(OBJEXT) \ - lib_a-dtoa.$(OBJEXT) lib_a-dtoastub.$(OBJEXT) \ - lib_a-environ.$(OBJEXT) lib_a-envlock.$(OBJEXT) \ -@@ -132,15 +131,15 @@ - @HAVE_LONG_DOUBLE_TRUE@am__objects_8 = strtold.lo wcstold.lo - am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \ - __ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo atexit.lo \ -- atof.lo atoff.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo \ -- dtoastub.lo environ.lo envlock.lo eprintf.lo exit.lo \ -- gdtoa-gethex.lo gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo \ -- ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \ -- mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \ -- mstats.lo rand.lo rand_r.lo realloc.lo reallocf.lo \ -- sb_charsets.lo strtod.lo strtol.lo strtoul.lo wcstod.lo \ -- wcstol.lo wcstoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \ -- wctomb_r.lo $(am__objects_8) -+ atof.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \ -+ environ.lo envlock.lo eprintf.lo exit.lo gdtoa-gethex.lo \ -+ gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo ldiv.lo ldtoa.lo \ -+ malloc.lo mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \ -+ mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo rand.lo \ -+ rand_r.lo realloc.lo reallocf.lo sb_charsets.lo strtod.lo \ -+ strtol.lo strtoul.lo wcstod.lo wcstol.lo wcstoul.lo \ -+ wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \ -+ $(am__objects_8) - am__objects_10 = cxa_atexit.lo cxa_finalize.lo drand48.lo ecvtbuf.lo \ - efgcvt.lo erand48.lo jrand48.lo lcong48.lo lrand48.lo \ - mrand48.lo msize.lo mtrim.lo nrand48.lo rand48.lo seed48.lo \ -@@ -330,13 +329,13 @@ - INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \ - __ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c \ -- atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c \ -- environ.c envlock.c eprintf.c exit.c gdtoa-gethex.c \ -- gdtoa-hexnan.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c \ -- malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c \ -- mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c \ -- reallocf.c sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c \ -- wcstol.c wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \ -+ atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c \ -+ envlock.c eprintf.c exit.c gdtoa-gethex.c gdtoa-hexnan.c \ -+ getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c \ -+ mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c \ -+ mprec.c mstats.c rand.c rand_r.c realloc.c reallocf.c \ -+ sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c wcstol.c \ -+ wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \ - $(am__append_1) - EXTENDED_SOURCES = \ - cxa_atexit.c \ -@@ -616,12 +615,6 @@ - lib_a-atof.obj: atof.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atof.obj `if test -f 'atof.c'; then $(CYGPATH_W) 'atof.c'; else $(CYGPATH_W) '$(srcdir)/atof.c'; fi` - --lib_a-atoff.o: atoff.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.o `test -f 'atoff.c' || echo '$(srcdir)/'`atoff.c -- --lib_a-atoff.obj: atoff.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.obj `if test -f 'atoff.c'; then $(CYGPATH_W) 'atoff.c'; else $(CYGPATH_W) '$(srcdir)/atoff.c'; fi` -- - lib_a-atoi.o: atoi.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoi.o `test -f 'atoi.c' || echo '$(srcdir)/'`atoi.c - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c newlib-1.19.0/newlib/libc/stdlib/putenv_r.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c 2004-11-24 23:34:14.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/putenv_r.c 2011-03-24 13:21:38.883638553 +0100 -@@ -24,6 +24,7 @@ - #include <reent.h> - #include <stdlib.h> - #include <string.h> -+#include <strings.h> - - #include "envlock.h" - -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcmp.c newlib-1.19.0/newlib/libc/string/bcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/bcmp.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bcmp.c 2011-03-24 13:21:38.884638568 +0100 -@@ -6,11 +6,11 @@ - bcmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int bcmp(<[s1]>, <[s2]>, <[n]>) - const void *<[s1]>; - const void *<[s2]>; -@@ -35,7 +35,7 @@ - bcmp ansi pure - */ - --#include <string.h> -+#include <strings.h> - - int - _DEFUN (bcmp, (m1, m2, n), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcopy.c newlib-1.19.0/newlib/libc/string/bcopy.c ---- newlib-1.19.0.orig/newlib/libc/string/bcopy.c 2002-05-23 20:46:04.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bcopy.c 2011-03-24 13:21:38.884638568 +0100 -@@ -3,7 +3,7 @@ - <<bcopy>>---copy memory regions - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>); - - TRAD_SYNOPSIS -@@ -26,7 +26,7 @@ - bcopy - pure - */ - --#include <string.h> -+#include <strings.h> - - void - _DEFUN (bcopy, (b1, b2, length), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bzero.c newlib-1.19.0/newlib/libc/string/bzero.c ---- newlib-1.19.0.orig/newlib/libc/string/bzero.c 2002-05-23 20:46:04.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bzero.c 2011-03-24 13:21:38.884638568 +0100 -@@ -6,11 +6,11 @@ - bzero - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bzero(void *<[b]>, size_t <[length]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bzero(<[b]>, <[length]>) - void *<[b]>; - size_t <[length]>; -@@ -30,7 +30,7 @@ - <<bzero>> requires no supporting OS subroutines. - */ - --#include <string.h> -+#include <strings.h> - - _VOID - _DEFUN (bzero, (b, length), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/index.c newlib-1.19.0/newlib/libc/string/index.c ---- newlib-1.19.0.orig/newlib/libc/string/index.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/index.c 2011-03-24 13:21:38.884638568 +0100 -@@ -6,11 +6,11 @@ - index - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * index(const char *<[string]>, int <[c]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * index(<[string]>, <[c]>); - char *<[string]>; - int *<[c]>; -@@ -33,7 +33,8 @@ - index - pure - */ - --#include <string.h> -+#include <strings.h> -+#include <string.h> /* strchr */ - - char * - _DEFUN (index, (s, c), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.am newlib-1.19.0/newlib/libc/string/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/string/Makefile.am 2010-05-11 22:27:20.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/Makefile.am 2011-03-24 13:21:38.883638553 +0100 -@@ -71,7 +71,8 @@ - wmemcmp.c \ - wmemcpy.c \ - wmemmove.c \ -- wmemset.c -+ wmemset.c \ -+ xpg_strerror_r.c - - if ELIX_LEVEL_1 - ELIX_2_SOURCES = -diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.in newlib-1.19.0/newlib/libc/string/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/string/Makefile.in 2010-12-16 22:59:03.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/Makefile.in 2011-03-24 13:21:38.884638568 +0100 -@@ -88,7 +88,7 @@ - lib_a-wcsxfrm.$(OBJEXT) lib_a-wcwidth.$(OBJEXT) \ - lib_a-wmemchr.$(OBJEXT) lib_a-wmemcmp.$(OBJEXT) \ - lib_a-wmemcpy.$(OBJEXT) lib_a-wmemmove.$(OBJEXT) \ -- lib_a-wmemset.$(OBJEXT) -+ lib_a-wmemset.$(OBJEXT) lib_a-xpg_strerror_r.$(OBJEXT) - @ELIX_LEVEL_1_FALSE@am__objects_2 = lib_a-bcmp.$(OBJEXT) \ - @ELIX_LEVEL_1_FALSE@ lib_a-memccpy.$(OBJEXT) \ - @ELIX_LEVEL_1_FALSE@ lib_a-mempcpy.$(OBJEXT) \ -@@ -120,7 +120,7 @@ - wcslcpy.lo wcslen.lo wcsncat.lo wcsncmp.lo wcsncpy.lo \ - wcsnlen.lo wcspbrk.lo wcsrchr.lo wcsspn.lo wcsstr.lo wcstok.lo \ - wcswidth.lo wcsxfrm.lo wcwidth.lo wmemchr.lo wmemcmp.lo \ -- wmemcpy.lo wmemmove.lo wmemset.lo -+ wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo - @ELIX_LEVEL_1_FALSE@am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \ - @ELIX_LEVEL_1_FALSE@ stpcpy.lo stpncpy.lo strndup.lo \ - @ELIX_LEVEL_1_FALSE@ strcasestr.lo strndup_r.lo wcpcpy.lo \ -@@ -363,7 +363,8 @@ - wmemcmp.c \ - wmemcpy.c \ - wmemmove.c \ -- wmemset.c -+ wmemset.c \ -+ xpg_strerror_r.c - - @ELIX_LEVEL_1_FALSE@ELIX_2_SOURCES = \ - @ELIX_LEVEL_1_FALSE@ bcmp.c \ -@@ -887,6 +888,12 @@ - lib_a-wmemset.obj: wmemset.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wmemset.obj `if test -f 'wmemset.c'; then $(CYGPATH_W) 'wmemset.c'; else $(CYGPATH_W) '$(srcdir)/wmemset.c'; fi` - -+lib_a-xpg_strerror_r.o: xpg_strerror_r.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.o `test -f 'xpg_strerror_r.c' || echo '$(srcdir)/'`xpg_strerror_r.c -+ -+lib_a-xpg_strerror_r.obj: xpg_strerror_r.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.obj `if test -f 'xpg_strerror_r.c'; then $(CYGPATH_W) 'xpg_strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/xpg_strerror_r.c'; fi` -+ - lib_a-bcmp.o: bcmp.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-bcmp.o `test -f 'bcmp.c' || echo '$(srcdir)/'`bcmp.c - -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memccpy.c newlib-1.19.0/newlib/libc/string/memccpy.c ---- newlib-1.19.0.orig/newlib/libc/string/memccpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memccpy.c 2011-03-24 13:21:38.884638568 +0100 -@@ -35,13 +35,14 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <stddef.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the word copy loop. */ - #define LITTLEBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memchr.c newlib-1.19.0/newlib/libc/string/memchr.c ---- newlib-1.19.0.orig/newlib/libc/string/memchr.c 2008-05-27 01:31:08.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memchr.c 2011-03-24 13:21:38.885638583 +0100 -@@ -38,10 +38,11 @@ - - #include <_ansi.h> - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ --#define UNALIGNED(X) ((long)X & (sizeof (long) - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (sizeof (long) - 1)) - - /* How many bytes are loaded each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcmp.c newlib-1.19.0/newlib/libc/string/memcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/memcmp.c 2005-03-06 21:40:05.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/memcmp.c 2011-03-24 13:21:38.885638583 +0100 -@@ -37,11 +37,11 @@ - */ - - #include <string.h> -- -+#include <stdint.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcpy.c newlib-1.19.0/newlib/libc/string/memcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/memcpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memcpy.c 2011-03-24 13:21:38.885638583 +0100 -@@ -34,11 +34,12 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <string.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memmove.c newlib-1.19.0/newlib/libc/string/memmove.c ---- newlib-1.19.0.orig/newlib/libc/string/memmove.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memmove.c 2011-03-24 13:21:38.885638583 +0100 -@@ -36,13 +36,14 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <_ansi.h> - #include <stddef.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/mempcpy.c newlib-1.19.0/newlib/libc/string/mempcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/mempcpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/mempcpy.c 2011-03-24 13:21:38.885638583 +0100 -@@ -34,10 +34,11 @@ - #include <stddef.h> - #include <limits.h> - #include <string.h> -+#include <stdint.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memset.c newlib-1.19.0/newlib/libc/string/memset.c ---- newlib-1.19.0.orig/newlib/libc/string/memset.c 2008-05-27 20:44:40.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memset.c 2011-03-24 13:21:38.885638583 +0100 -@@ -34,9 +34,10 @@ - */ - - #include <string.h> -+#include <stdint.h> - - #define LBLOCKSIZE (sizeof(long)) --#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1)) - #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE) - - _PTR -diff -Naur newlib-1.19.0.orig/newlib/libc/string/rindex.c newlib-1.19.0/newlib/libc/string/rindex.c ---- newlib-1.19.0.orig/newlib/libc/string/rindex.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/rindex.c 2011-03-24 13:21:38.885638583 +0100 -@@ -10,7 +10,7 @@ - char * rindex(const char *<[string]>, int <[c]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * rindex(<[string]>, <[c]>); - char *<[string]>; - int *<[c]>; -@@ -33,7 +33,8 @@ - rindex - pure - */ - --#include <string.h> -+#include <strings.h> -+#include <string.h> /* strchr */ - - char * - _DEFUN (rindex, (s, c), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpcpy.c newlib-1.19.0/newlib/libc/string/stpcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/stpcpy.c 2007-06-28 19:07:23.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/stpcpy.c 2011-03-24 13:21:38.886638599 +0100 -@@ -34,6 +34,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -41,7 +42,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpncpy.c newlib-1.19.0/newlib/libc/string/stpncpy.c ---- newlib-1.19.0.orig/newlib/libc/string/stpncpy.c 2007-06-28 19:07:23.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/stpncpy.c 2011-03-24 13:21:38.886638599 +0100 -@@ -40,6 +40,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -47,7 +48,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c newlib-1.19.0/newlib/libc/string/strcasecmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c 2009-04-23 20:11:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strcasecmp.c 2011-03-24 13:21:38.886638599 +0100 -@@ -6,11 +6,11 @@ - strcasecmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strcasecmp(const char *<[a]>, const char *<[b]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strcasecmp(<[a]>, <[b]>) - char *<[a]>; - char *<[b]>; -@@ -38,7 +38,7 @@ - strcasecmp - */ - --#include <string.h> -+#include <strings.h> - #include <ctype.h> - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcat.c newlib-1.19.0/newlib/libc/string/strcat.c ---- newlib-1.19.0.orig/newlib/libc/string/strcat.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strcat.c 2011-03-24 13:21:38.886638599 +0100 -@@ -33,12 +33,13 @@ - strcat ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if X is aligned on a "long" boundary. */ - #define ALIGNED(X) \ -- (((long)X & (sizeof (long) - 1)) == 0) -+ (((uintptr_t)X & (sizeof (long) - 1)) == 0) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchr.c newlib-1.19.0/newlib/libc/string/strchr.c ---- newlib-1.19.0.orig/newlib/libc/string/strchr.c 2008-05-22 04:31:46.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strchr.c 2011-03-24 13:21:38.886638599 +0100 -@@ -33,11 +33,12 @@ - strchr ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if X is not aligned on a "long" boundary. */ --#define UNALIGNED(X) ((long)X & (sizeof (long) - 1)) -+#define UNALIGNED(X) ((uintptr_t)X & (sizeof (long) - 1)) - - /* How many bytes are loaded each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcmp.c newlib-1.19.0/newlib/libc/string/strcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strcmp.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strcmp.c 2011-03-24 13:21:38.886638599 +0100 -@@ -35,12 +35,13 @@ - strcmp ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ - #if LONG_MAX == 2147483647L -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcpy.c newlib-1.19.0/newlib/libc/string/strcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/strcpy.c 2007-05-29 23:26:59.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strcpy.c 2011-03-24 13:21:38.886638599 +0100 -@@ -32,6 +32,7 @@ - strcpy ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - -@@ -40,7 +41,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror.c newlib-1.19.0/newlib/libc/string/strerror.c ---- newlib-1.19.0.orig/newlib/libc/string/strerror.c 2009-03-15 14:41:46.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strerror.c 2011-03-24 13:21:38.887638615 +0100 -@@ -301,6 +301,17 @@ - result string; therefore portable code cannot depend on the reentrancy - of this subroutine. - -+Although this implementation of <<strerror>> guarantees a non-null -+result with a NUL-terminator, some implementations return <<NULL>> -+on failure. Although POSIX allows <<strerror>> to set <<errno>> -+to EINVAL on failure, this implementation does not do so (unless -+you provide <<_user_strerror>>). -+ -+POSIX recommends that unknown <[errnum]> result in a message -+including that value, however it is not a requirement and this -+implementation does not provide that information (unless you -+provide <<_user_strerror>>). -+ - This implementation of <<strerror>> provides for user-defined - extensibility. <<errno.h>> defines <[__ELASTERROR]>, which can be - used as a base for user-defined error values. If the user supplies a -@@ -313,6 +324,9 @@ - <<_user_strerror>> returns <[NULL]>. The default <<_user_strerror>> - returns <[NULL]> for all input values. - -+Note that <<_user_sterror>> must be thread-safe and not alter <<errno>> -+if <<strerror_r>> is to comply with POSIX. -+ - <<strerror>> requires no supporting OS subroutines. - - QUICKREF -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror_r.c newlib-1.19.0/newlib/libc/string/strerror_r.c ---- newlib-1.19.0.orig/newlib/libc/string/strerror_r.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strerror_r.c 2011-03-24 13:21:38.887638615 +0100 -@@ -1,3 +1,4 @@ -+/* GNU variant of strerror_r. */ - /* - FUNCTION - <<strerror_r>>---convert error number to string and copy to buffer -@@ -7,7 +8,11 @@ - - ANSI_SYNOPSIS - #include <string.h> -+ #ifdef _GNU_SOURCE - char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>); -+ #else -+ int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>); -+ #endif - - TRAD_SYNOPSIS - #include <string.h> -@@ -19,35 +24,60 @@ - DESCRIPTION - <<strerror_r>> converts the error number <[errnum]> into a - string and copies the result into the supplied <[buffer]> for --a length up to <[n]>, including the NUL terminator. The value of --<[errnum]> is usually a copy of <<errno>>. If <<errnum>> is not a known -+a length up to <[n]>, including the NUL terminator. The value of -+<[errnum]> is usually a copy of <<errno>>. If <<errnum>> is not a known - error number, the result is the empty string. - - See <<strerror>> for how strings are mapped to <<errnum>>. - - RETURNS --This function returns a pointer to a string. Your application must --not modify that string. -+There are two variants: the GNU version always returns a NUL-terminated -+string, which is <[buffer]> if all went well, but which is another -+pointer if <[n]> was too small (leaving <[buffer]> untouched). If the -+return is not <[buffer]>, your application must not modify that string. -+The POSIX version returns 0 on success, <[EINVAL]> if <<errnum>> was not -+recognized, and <[ERANGE]> if <[n]> was too small. The variant chosen -+depends on macros that you define before inclusion of <<string.h>>. - - PORTABILITY --<<strerror_r>> is a GNU extension. -+<<strerror_r>> with a <[char *]> result is a GNU extension. -+<<strerror_r>> with an <[int]> result is required by POSIX 2001. -+This function is compliant only if <<_user_strerror>> is not provided, -+or if it is thread-safe and does not modify <<errno>>. -+ -+POSIX states that the contents of <[buf]> are unspecified on error, -+although this implementation guarantees a NUL-terminated string for -+all except <[n]> of 0. -+ -+POSIX recommends that unknown <[errnum]> result in a message including -+that value, however it is not a requirement and this implementation -+provides only an empty string (unless you provide <<_user_strerror>>). -+POSIX also recommends that unknown <[errnum]> fail with EINVAL even -+when providing such a message, however it is not a requirement and -+this implementation will return success if <<_user_strerror>> provided -+a non-empty alternate string. - - <<strerror_r>> requires no supporting OS subroutines. - - */ - - #undef __STRICT_ANSI__ -+#define _GNU_SOURCE - #include <errno.h> - #include <string.h> -+#undef strerror_r - -+/* For backwards-compatible linking, this must be the GNU signature; -+ see xpg_strerror_r.c for the POSIX version. */ - char * - _DEFUN (strerror_r, (errnum, buffer, n), - int errnum _AND - char *buffer _AND - size_t n) - { -- char *error; -- error = strerror (errnum); -+ char *error = strerror (errnum); - -- return strncpy (buffer, (const char *)error, n); -+ if (strlen (error) >= n) -+ return error; -+ return strcpy (buffer, error); - } -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strlen.c newlib-1.19.0/newlib/libc/string/strlen.c ---- newlib-1.19.0.orig/newlib/libc/string/strlen.c 2008-05-27 00:56:14.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strlen.c 2011-03-24 13:21:38.887638615 +0100 -@@ -32,11 +32,12 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - #define LBLOCKSIZE (sizeof (long)) --#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1)) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c newlib-1.19.0/newlib/libc/string/strncasecmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c 2009-04-23 20:11:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strncasecmp.c 2011-03-24 13:21:38.887638615 +0100 -@@ -6,11 +6,11 @@ - strncasecmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strncasecmp(<[a]>, <[b]>, <[length]>) - char *<[a]>; - char *<[b]>; -@@ -40,7 +40,7 @@ - strncasecmp - */ - --#include <string.h> -+#include <strings.h> - #include <ctype.h> - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncat.c newlib-1.19.0/newlib/libc/string/strncat.c ---- newlib-1.19.0.orig/newlib/libc/string/strncat.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strncat.c 2011-03-24 13:21:38.887638615 +0100 -@@ -42,11 +42,12 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /* Nonzero if X is aligned on a "long" boundary. */ - #define ALIGNED(X) \ -- (((long)X & (sizeof (long) - 1)) == 0) -+ (((intptr_t)X & (sizeof (long) - 1)) == 0) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncmp.c newlib-1.19.0/newlib/libc/string/strncmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strncmp.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strncmp.c 2011-03-24 13:21:38.887638615 +0100 -@@ -36,12 +36,13 @@ - strncmp ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ - #if LONG_MAX == 2147483647L -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncpy.c newlib-1.19.0/newlib/libc/string/strncpy.c ---- newlib-1.19.0.orig/newlib/libc/string/strncpy.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strncpy.c 2011-03-24 13:21:38.888638631 +0100 -@@ -38,6 +38,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -45,7 +46,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c ---- newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c 2011-03-24 13:21:38.888638631 +0100 -@@ -0,0 +1,25 @@ -+/* POSIX variant of strerror_r. */ -+#undef __STRICT_ANSI__ -+#include <errno.h> -+#include <string.h> -+ -+int -+_DEFUN (__xpg_strerror_r, (errnum, buffer, n), -+ int errnum _AND -+ char *buffer _AND -+ size_t n) -+{ -+ char *error; -+ -+ if (!n) -+ return ERANGE; -+ error = strerror (errnum); -+ if (strlen (error) >= n) -+ { -+ memcpy (buffer, error, n - 1); -+ buffer[n - 1] = '\0'; -+ return ERANGE; -+ } -+ strcpy (buffer, error); -+ return *error ? 0 : EINVAL; -+} -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h ---- newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h 2002-07-24 20:18:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h 2011-03-24 13:21:38.888638631 +0100 -@@ -50,7 +50,6 @@ - - #ifndef _POSIX_SOURCE - extern const char *const sys_siglist[]; --typedef __sighandler_t sig_t; /* BSDism */ - #endif - - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.19.0/newlib/libc/sys/rtems/crt0.c ---- newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c 2009-12-16 19:28:14.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/sys/rtems/crt0.c 2011-03-24 13:21:38.888638631 +0100 -@@ -24,8 +24,8 @@ - /* RTEMS provides some of its own routines including a Malloc family */ - RTEMS_STUB(void *,malloc(size_t s)) { return 0; } - RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; } --RTEMS_STUB(void, free(void)) { ; } --RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {} -+RTEMS_STUB(void, free(void* ptr)) { ; } -+RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2)) {} - - #if defined(__GNUC__) - /* -@@ -49,6 +49,7 @@ - #endif - - /* stubs for functions RTEMS provides */ -+RTEMS_STUB(int, clock_gettime(clockid_t clk_id, struct timespec *tp)) { return -1; } - RTEMS_STUB(int, close (int fd)) { return -1; } - RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; } - RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; } -@@ -56,6 +57,7 @@ - RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; } - RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; } - RTEMS_STUB(char *, getlogin(void)) { return 0; } -+RTEMS_STUB(int, gettimeofday(struct timeval *tv, struct timezone *tz)) { return -1; } - RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; } - RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; } - RTEMS_STUB(uid_t, getuid(void)) { return 0; } -@@ -65,6 +67,7 @@ - RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; } - RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; } - RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; } -+RTEMS_STUB(int, sched_yield(void)) { return -1; } - RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; } - RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; } - RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; } -@@ -95,7 +98,7 @@ - RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; } - #if !defined(REENTRANT_SYSCALLS_PROVIDED) - /* cf. newlib/libc/reent/linkr.c */ --RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; } -+RTEMS_STUB(int, _link_r (struct _reent *r, const char *oldpath, const char *newpath)) { return -1; } - #endif - RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; } - RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; } -@@ -103,14 +106,14 @@ - RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; } - #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED)) - /* cf. newlib/libc/reent/sbrkr.c */ --RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; } -+RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t addr)) { return 0; } - #endif - RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; } - RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; } - RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; } - #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC)) - /* cf. newlib/libc/reent/execr.c */ --RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; } -+RTEMS_STUB(int, _wait_r (struct _reent *r, int *status)) { return -1; } - #endif - RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; } - -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h ---- newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h 2010-07-06 17:23:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h 2011-03-24 13:21:38.888638631 +0100 -@@ -50,7 +50,7 @@ - - int scandir ( const char *dirname, - struct dirent *** namelist, -- int (*select)(struct dirent *), -+ int (*select)(const struct dirent *), - int (*dcomp)(const struct dirent **, const struct dirent **) - ); - -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr.c newlib-1.19.0/newlib/libc/xdr/xdr.c ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr.c 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr.c 2011-03-24 13:21:38.888638631 +0100 -@@ -113,7 +113,7 @@ - #elif INT_MAX == LONG_MAX - return xdr_long (xdrs, (long *) ip); - #else --# error Unexpeced integer sizes in xdr_int() -+# error Unexpected integer sizes in xdr_int() - #endif - } - -@@ -148,7 +148,7 @@ - #elif UINT_MAX == ULONG_MAX - return xdr_u_long (xdrs, (u_long *) up); - #else --# error Unexpeced integer sizes in xdr_int() -+# error Unexpected integer sizes in xdr_int() - #endif - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h newlib-1.19.0/newlib/libc/xdr/xdr_private.h ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr_private.h 2011-03-24 13:21:38.889638646 +0100 -@@ -25,6 +25,7 @@ - - #include <_ansi.h> - #include <stdarg.h> -+#include <stdint.h> - #include <sys/param.h> - - /* avoid including stdio header here */ -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c newlib-1.19.0/newlib/libc/xdr/xdr_rec.c ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr_rec.c 2011-03-24 13:21:38.889638646 +0100 -@@ -51,6 +51,7 @@ - #include <assert.h> - #include <unistd.h> - #include <errno.h> -+#include <limits.h> - - #include <rpc/types.h> - #include <rpc/xdr.h> -diff -Naur newlib-1.19.0.orig/newlib/libm/common/modfl.c newlib-1.19.0/newlib/libm/common/modfl.c ---- newlib-1.19.0.orig/newlib/libm/common/modfl.c 2009-04-18 00:15:43.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/common/modfl.c 2011-03-24 13:21:38.889638646 +0100 -@@ -36,7 +36,7 @@ - long double - modfl (long double x, long double *iptr) - { -- return modf(x, iptr); -+ return modf(x, (double*) iptr); - } - #endif - -diff -Naur newlib-1.19.0.orig/newlib/libm/common/s_round.c newlib-1.19.0/newlib/libm/common/s_round.c ---- newlib-1.19.0.orig/newlib/libm/common/s_round.c 2009-03-25 20:13:01.000000000 +0100 -+++ newlib-1.19.0/newlib/libm/common/s_round.c 2011-03-24 13:21:38.889638646 +0100 -@@ -68,7 +68,7 @@ - msw &= 0x80000000; - if (exponent_less_1023 == -1) - /* Result is +1.0 or -1.0. */ -- msw |= (1023 << 20); -+ msw |= ((__int32_t)1023 << 20); - lsw = 0; - } - else -diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cproj.c newlib-1.19.0/newlib/libm/complex/cproj.c ---- newlib-1.19.0.orig/newlib/libm/complex/cproj.c 2010-10-19 00:40:24.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/complex/cproj.c 2011-03-24 13:21:38.889638646 +0100 -@@ -93,7 +93,7 @@ - { - double_complex w = { .z = z }; - -- if (isinf(creal(z) || isinf(cimag(z)))) { -+ if (isinf(creal(z)) || isinf(cimag(z))) { - #ifdef __INFINITY - REAL_PART(w) = __INFINITY; - #else -diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cprojf.c newlib-1.19.0/newlib/libm/complex/cprojf.c ---- newlib-1.19.0.orig/newlib/libm/complex/cprojf.c 2010-10-08 12:35:14.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/complex/cprojf.c 2011-03-24 13:21:38.890638661 +0100 -@@ -55,7 +55,7 @@ - { - float_complex w = { .z = z }; - -- if (isinf(crealf(z) || isinf(cimagf(z)))) { -+ if (isinf(crealf(z)) || isinf(cimagf(z))) { - #ifdef __INFINITY - REAL_PART(w) = __INFINITY; - #else -diff -Naur newlib-1.19.0.orig/newlib/libm/math/e_scalb.c newlib-1.19.0/newlib/libm/math/e_scalb.c ---- newlib-1.19.0.orig/newlib/libm/math/e_scalb.c 2000-02-17 20:39:51.000000000 +0100 -+++ newlib-1.19.0/newlib/libm/math/e_scalb.c 2011-03-24 13:21:38.890638661 +0100 -@@ -17,6 +17,7 @@ - * should use scalbn() instead. - */ - -+#include <limits.h> - #include "fdlibm.h" - - #ifndef _DOUBLE_IS_32BITS -@@ -46,8 +47,17 @@ - else return x/(-fn); - } - if (rint(fn)!=fn) return (fn-fn)/(fn-fn); -+#if (INT_MAX < 65000) -+ if ( fn > (double) INT_MAX) return scalbn(x, INT_MAX); -+#else - if ( fn > 65000.0) return scalbn(x, 65000); -- if (-fn > 65000.0) return scalbn(x,-65000); -+#endif -+ -+#if (INT_MIN > -65000) -+ if (fn < (double) INT_MIN) return scalbn(x,INT_MIN); -+#else -+ if (fn < -65000.0) return scalbn(x,-65000); -+#endif - return scalbn(x,(int)fn); - #endif - } -diff -Naur newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c newlib-1.19.0/newlib/libm/math/wf_tgamma.c ---- newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c 2007-09-04 19:33:10.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/math/wf_tgamma.c 2011-03-24 13:21:38.890638661 +0100 -@@ -43,3 +43,17 @@ - return y; - #endif - } -+ -+#ifdef _DOUBLE_IS_32BITS -+ -+#ifdef __STDC__ -+ double tgamma(double x) -+#else -+ double tgamma(x) -+ double x; -+#endif -+{ -+ return (double) tgammaf((float) x); -+} -+ -+#endif /* defined(_DOUBLE_IS_32BITS) */ -diff -Naur newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c newlib-1.19.0/newlib/libm/math/w_tgamma.c ---- newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c 2002-06-07 23:59:56.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/math/w_tgamma.c 2011-03-24 13:21:38.890638661 +0100 -@@ -17,6 +17,8 @@ - - #include "fdlibm.h" - -+#ifndef _DOUBLE_IS_32BITS -+ - #ifdef __STDC__ - double tgamma(double x) - #else -@@ -42,3 +44,5 @@ - return y; - #endif - } -+ -+#endif /* defined(_DOUBLE_IS_32BITS) */ -diff -Naur newlib-1.19.0.orig/newlib/MAINTAINERS newlib-1.19.0/newlib/MAINTAINERS ---- newlib-1.19.0.orig/newlib/MAINTAINERS 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/MAINTAINERS 2011-03-24 13:21:38.864638267 +0100 -@@ -6,7 +6,7 @@ - The official maintainers of newlib: - - Jeff Johnston jjohnstn@redhat.com --Corinna Vinschen corinna@vinchen.de -+Corinna Vinschen corinna@vinschen.de - - - Various Domain Maintainers -diff -Naur newlib-1.19.0.orig/newlib/Makefile.am newlib-1.19.0/newlib/Makefile.am ---- newlib-1.19.0.orig/newlib/Makefile.am 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/Makefile.am 2011-03-24 13:21:38.864638267 +0100 -@@ -81,7 +81,7 @@ - libc.a - endif - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - - toollib_DATA = $(CRT0) $(CRT1) - -@@ -255,7 +255,7 @@ - done - touch $@ - --CLEANFILES = targ-include stmp-targ-include -+CLEANFILES = stmp-targ-include - - install-data-local: install-toollibLIBRARIES - if USE_LIBTOOL -@@ -279,10 +279,6 @@ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ - else true; fi ; \ - done; \ -- $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \ -- for i in $(srcdir)/libc/include/rpc/*.h; do \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \ -- done; \ - $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ - for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ -@@ -430,3 +426,6 @@ - else \ - echo "WARNING: could not find \`runtest'" 1>&2 ; \ - fi -+ -+clean-local: -+ -rm -rf targ-include -diff -Naur newlib-1.19.0.orig/newlib/Makefile.in newlib-1.19.0/newlib/Makefile.in ---- newlib-1.19.0.orig/newlib/Makefile.in 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/Makefile.in 2011-03-24 13:21:38.865638281 +0100 -@@ -122,7 +122,7 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --DATA = $(noinst_DATA) $(toollib_DATA) -+DATA = $(toollib_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -351,7 +351,7 @@ - @USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \ - @USE_LIBTOOL_FALSE@ libc.a - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - toollib_DATA = $(CRT0) $(CRT1) - - # The functions ldexp, frexp and modf are traditionally supplied in -@@ -405,13 +405,13 @@ - @USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES = libm-libtool-objectlist - @USE_LIBTOOL_TRUE@libc_la_SOURCES = - @USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = libc-libtool-objectlist --CLEANFILES = targ-include stmp-targ-include -+CLEANFILES = stmp-targ-include - CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host - MAKEOVERRIDES = - - # dejagnu support - RUNTESTFLAGS = --all: newlib.h -+all: $(BUILT_SOURCES) newlib.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: -@@ -725,14 +725,16 @@ - done - check-am: - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU --check: check-recursive -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-recursive - all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done --install: install-recursive -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive -@@ -758,10 +760,11 @@ - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - clean: clean-recursive - --clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \ -- clean-toollibLTLIBRARIES mostlyclean-am -+clean-am: clean-generic clean-libtool clean-local \ -+ clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -@@ -833,12 +836,13 @@ - uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \ - uninstall-toollibLTLIBRARIES - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ -- ctags-recursive install-am install-strip tags-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ -+ check-am ctags-recursive install install-am install-strip \ -+ tags-recursive - - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-DEJAGNU check-am clean \ -- clean-generic clean-libtool clean-toollibLIBRARIES \ -+ clean-generic clean-libtool clean-local clean-toollibLIBRARIES \ - clean-toollibLTLIBRARIES ctags ctags-recursive distclean \ - distclean-DEJAGNU distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \ -@@ -985,10 +989,6 @@ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ - else true; fi ; \ - done; \ -- $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \ -- for i in $(srcdir)/libc/include/rpc/*.h; do \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \ -- done; \ - $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ - for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ -@@ -1129,6 +1129,9 @@ - echo "WARNING: could not find \`runtest'" 1>&2 ; \ - fi - -+clean-local: -+ -rm -rf targ-include -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110423.diff b/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110423.diff deleted file mode 100644 index 49e13bbaa2..0000000000 --- a/contrib/crossrpms/patches/newlib-1.19.0-rtems4.11-20110423.diff +++ /dev/null @@ -1,3730 +0,0 @@ -diff -Naur newlib-1.19.0.orig/newlib/ChangeLog newlib-1.19.0/newlib/ChangeLog ---- newlib-1.19.0.orig/newlib/ChangeLog 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/ChangeLog 2011-04-22 23:54:49.680333302 +0200 -@@ -1,3 +1,171 @@ -+2011-04-20 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/include/limits.h: Compute SSIZE_MAX on __SIZE_MAX__. -+ -+2011-04-19 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/stdint.h: Rework SIZE_MAX. -+ * libc/sys/rtems/include/limits.h: Rework SSIZE_MAX. -+ -+2011-03-23 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/sys/dirent.h: Add const to "select" parameter. -+ -+2011-03-03 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/string.h: Include sys/cdefs.h. -+ -+2011-03-03 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/sys/cdefs.h (__CONCAT1): Define. -+ (__CONCAT): Define. -+ (__STRING): Define. -+ (__XSTRING): Define. -+ (__ASMNAME): Define. -+ * libc/include/string.h (strerror_r): Use __ASMNAME to take target -+ specific label prefixes into account. -+ -+2011-03-01 Aaron Landwehr <snaphat@gmail.com> -+ -+ * libm/complex/cproj.c: Fix typo. -+ * libm/complex/cprojf.c: Ditto. -+ -+2011-02-22 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/stdio/fmemopen.c (fmemopen): Fix EINVAL condition. Avoid SEGV -+ if incoming buffer is NULL. -+ -+2011-02-09 Eric Blake <eblake@redhat.com> -+ -+ * libc/include/string.h (strerror_r): Update declaration. -+ * libc/string/strerror.c (strerror): Update documentation. -+ * libc/string/strerror_r.c (strerror_r): Always return -+ NUL-terminated string; don't overwrite too-short buf. -+ * libc/string/xpg_strerror_r.c (__xpg_strerror_r): Implement POSIX -+ variant. -+ * libc/string/Makefile.am (GENERAL_SOURCES): Build new file. -+ * libc/string/Makefile.in: Regenerate. -+ -+2011-02-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/stdlib.h: More ansi-compliance. -+ -+2011-02-01 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/stdio.h: More ansi-compliance. -+ -+ * libc/include/stdlib.h: Remove atoff. -+ * libc/stdlib/atoff.c: Remove. -+ * libc/stdlib/atof.c: Remove atoff. -+ * libc/stdlib/Makefile.am: Remove atoff. -+ * libc/stdlib/Makefile.in: Regenerate. -+ -+ * libc/include/stdio.h: Make fdopen accessible to c99. -+ -+2011-01-31 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/crt0.c: Add clock_gettime, gettimeofday, -+ sched_yield. -+ -+2011-01-28 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/stdio/fclose.c: Only use sfp lock to guard non-atomic -+ changes of flags and fp lock. -+ * libc/stdio/freopen.c: Ditto. -+ * libc/stdio64/freopen64.c: Ditto. -+ * libc/stdio/fgetc.c: Revert change from 2009-04-24, remove sfp locks -+ which guard entire function to avoid potential deadlocks when using -+ stdio functions in multiple thraeds. -+ * libc/stdio/fgets.c: Ditto. -+ * libc/stdio/fgetwc.c: Ditto. -+ * libc/stdio/fgetws.c: Ditto. -+ * libc/stdio/fread.c: Ditto. -+ * libc/stdio/fseek.c: Ditto. -+ * libc/stdio/getc.c: Ditto. -+ * libc/stdio/getdelim.c: Ditto. -+ * libc/stdio/gets.c: Ditto. -+ * libc/stdio/vfscanf.c: Ditto. -+ * libc/stdio/vfwscanf.c: Ditto. -+ -+ * libc/stdio/fflush.c (_fflush_r): Split out core functionality into -+ new function __sflush_r. Just lock file and call __sflush_r from here. -+ * libc/stdio/fwalk.c (_fwalk): Remove static helper function and move -+ functionality back into main function. Don't walk a file with flags -+ value of 1. Add comment. -+ (_fwalk_reent): Ditto. -+ * libc/stdio/local.h (__sflush_r): Declare. -+ * libc/stdio/refill.c (__srefill): Before calling fwalk, set flags -+ value to 1 so this file pointer isn't walked. Revert flags afterwards -+ and call __sflush_r for this fp if necessary. Add comments. -+ -+2011-01-27 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/include/sys/features.h: Define __STDC_ISO_10646__ for Cygwin. -+ * libc/include/wchar.h: Include features.h. -+ -+2011-01-15 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> -+ -+ * libc/include/sys/types.h (ulong): Add typedef. -+ -+2011-01-12 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/math/w_tgamma.c: Only build ifndef _DOUBLE_IS_32BITS. -+ * libm/math/wf_tgamma.c: Map tgamma to tgammaf, ifdef _DOUBLE_IS_32BITS. -+ -+2011-01-11 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/string.h: Remove Cygwin DEFS_H kludge. -+ -+2011-01-10 Corinna Vinschen <vinschen@redhat.com> -+ -+ * libc/machine/mips/strlen.c (strlen): Add delay slot for R3000. -+ -+2011-01-10 Joel Sherrill <joel.sherrill@oarcorp.com> -+ -+ * libc/include/string.h: Make strsignal() available unconditionally. -+ -+2011-01-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/sys/rtems/crt0.c: Adjust free() and calloc() to match their -+ public decls. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * Makefile.am: Move cleaning targ-include to clean-local. -+ * Makefile.in: Regenerate. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/open_memstream.c (internal_open_memstream_r): -+ Don't limit c->max to 64*1024 on targets with SIZE_MAX < 64*1024. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/xdr/xdr.c: Fix typos in #errors. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/xdr/xdr_private.h: Include <stdint.h> -+ * libc/xdr/xdr_rec.c: Include limits.h -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/Makefile.am (SUBDEFS): Remove redundant posix/stmp-def. -+ * libc/Makefile.in: Regenerate. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/configure.in: Remove redundant posix_dir processing. -+ * libc/configure: Regenerate. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * doc/makedoc.c: Add cludge to make makedoc 64bit compliant. -+ -+2010-12-31 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * MAINTAINERS: Change corinna@vinchen.de to corinna@vinschen.de. -+ - 2010-12-16 Jeff Johnston <jjohnstn@redhat.com> - - * NEWS: Update with 1.19.0 info. -@@ -28,12 +196,12 @@ - - * libm/mathfp/sf_logarithm.c: Change isfinitef reference to isfinite. - --2010-12-08 Ralf Corsepius <ralf.corsepius@rtems.org> -+2010-12-08 Ralf Corsépius <ralf.corsepius@rtems.org> - - * include/sys/types.h: Add #if defined(__rtems__) around - pthread_attr_t.guardsize. - --2010-12-08 Joel Sherrill <joel@OARcorp.com> -+2010-12-08 Joel Sherrill <joel@OARcorp.com> - - * include/pthread.h: Add pthread_attr_setstack, pthread_attr_getstack, - pthread_attr_getguardsize, pthread_attr_setguardsize. -@@ -847,7 +1015,7 @@ - (__cp_index): Map invalid Windows codepage number 101 to - GEORGIAN-PS conversion array, 102 to PT154 conversion array. - --2010-02-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2010-02-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/telldir.c: Remove bogus nested prototype of lseek(). - -@@ -1005,6 +1173,18 @@ - * libc/include/sys/unistd.h (suboptarg, getsubopt): Move... - * libc/include/stdlib.h: ...here, to match POSIX for getsubopt. - -+2009-12-18 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/search/db_local.h: -+ Use __uint32_t instead of u_int (prototype mismatches). -+ * libc/search/extern.h (__buf_init): -+ Use __uint32_t instead of int (16 bit target portability). -+ * libc/search/hash_buf.c: Use ptrdiff_t instead of __uint32_t, -+ use __uint32_t instead of int (16 bit target portability). -+ * libc/search/hash.h: Use __uint32_it instead of int -+ (16 bit target portability). -+ * libm/common/modfl.c: Add cast to (double*) to avoid GCC warning. -+ - 2009-12-17 Jeff Johnston <jjohnstn@redhat.com> - - * NEWS: Update with 1.18.0 info. -@@ -1048,17 +1228,17 @@ - * libc/stdlib/atexit.c: Ditto. - * libc/stdlib/on_exit.c: Ditto. - --2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/ieeefp.h: Rework __IEEE_*_ENDIAN handling. - * libc/machine/arm/machine/endian.h: Remove (Conflicts with - libc/include/machine/endian.h) - --2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/setjmp.h: Set up _JBLEN #ifdef __m68k__. - --2009-12-17 Ralf Corsepius <ralf.corsepius@rtems.org> -+2009-12-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/pthread.h: Add pthread_atfork, pthread_rwlock_unlock - * libc/include/sys/stat.h: Use struct timespec st_*tim, -@@ -1076,11 +1256,11 @@ - and ETOOMANYREFS into general list as they are referenced - by OpenGroup and needed by RTEMS. - --2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/search/hcreate.c: Don't include <sys/queue.h> (Unused). - --2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/machine/_types.h: New (Derived from - machine/_default_types.h). -@@ -1204,6 +1384,18 @@ - rather check for return value of -1 and errno. Handle EINVAL - just like ESPIPE. Only set fp->_offset if errno is 0. - -+2009-10-29 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/inttypes.h: -+ Rework logic to determine PRI*PTR. -+ Prefer long64 over longlong64. -+ * libc/include/machine/_default_types.h: -+ Sync logic for __int32 with stdint.h (Prefer long over int). -+ * libc/include/stdint.h: -+ Remove __SPU__ hack. -+ Prefer int for int16_t (sync with _default_types.h). -+ Rework intptr_t determination. -+ - 2009-10-27 Nick Clifton <nickc@redhat.com> - - * MAINTAINERS (ARM): Add myself as an ARM maintainer. -@@ -1368,16 +1560,16 @@ - * libc/locale/locale.c: Drop Cygwin-specific windows.h include. - (loadlocale): Call __set_charset_from_codepage with 0 codepage. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdlib.h: Add posix_memalign. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host (*-rtems*): Remove -DMISSING_SYSCALL_NAMES. - Add -DHAVE_BLKSIZE, -D_NO_WORDEXP -D_NO_POPEN. - --2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> -+2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host (m32c): Move setting -DABORT_PROVIDED to second - "case $host". -@@ -2576,6 +2768,12 @@ - * libc/stdio/vfprintf.c: Ditto. - * libc/stdio/vswprintf.c: Ditto. - -+2009-03-09 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/machine/powerpc/times.c: Remove. -+ * libc/machine/powerpc/Makefile.am: Remove times.c. -+ * libc/machine/powerpc/Makefile.in: Regenerate. -+ - 2009-03-09 Brooks Moses <brooks@codesourcery.com> - - * libc/machine/arm/arm_asm.h: Fix typo. -@@ -2673,7 +2871,7 @@ - - * libc/machine/arm/strcpy.c: Add missing comma. - --2009-02-26 Ralf Corsepius <ralf.corsepius@rtems.org> -+2009-02-26 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/machine/lm32/configure.in: Let - AC_CONFIG_SRCDIR point to setjmp.S instead of setjmp.s -@@ -2859,24 +3057,24 @@ - * libc/string/wcstrings.tex: Ditto. - * libc/string/Makefile.in: Regenerated. - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/stdio/fputws.c: Fix documentation. - * libc/stdio/getwchar.c: Ditto. - * libc/stdio/putwchar.c: Ditto. - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/features.h: Set RTEMS's _POSIX_MONOTONIC_CLOCK to - 200112L (SUSv3 compliance). - Comment out RTEMS's _POSIX_SHARED_MEMORY_OBJECTS (Unsupported). - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/crt0.c: Add stubs for getdents(), nanosleep(), - _execve(), _exit(). - --2008-12-12 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-12-12 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.host: Let *rtems* default to c99-formats. - -@@ -3026,7 +3224,7 @@ - <linux/dirent.h>. - * libc/sys/linux/io64.c: Add weak alias for _stat64. - --2008-11-27 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/telldir.c: Use #if !defined() instead of #ifndef - to fix GCC warning. -@@ -3198,17 +3396,17 @@ - * libc/unix/collate.c (__collate_err): simplify to remove unnecessary - strdup() and strlen() calls, also getting rid of a compiler warning. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/config.h: Don't put - __ATTRIBUTE_IMPURE_PTR__ into .sdata section for mips-rtems. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/posix/runetype.h: Add include of stddef.h and remove - defining standard types: size_t and wchar_t. - --2008-11-19 Ralf Corsepius <ralf.corsepius@rtems.org> -+2008-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/pthread.h: Remove prototypes for - pthread_attr_getcputime and pthread_attr_setcputime which -@@ -5263,7 +5461,7 @@ - * libc/machine/spu/sprintf.c: Ditto. - * libc/machine/spu/sscanf.c: Ditto. - --2007-08-03 Ralf Corsepius <ralf.corsepius@rtems.org> -+2007-08-03 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/tar.h: New. - -@@ -6455,7 +6653,7 @@ - * libc/include/sys/unistd.h: Define all _SC_xxx values as - required by SUSv3. Unify formatting. - --2007-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> -+2007-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/errno.h: Add ECANCELED. - -@@ -7248,7 +7446,7 @@ - * libc/include/sys/signal.h (sigdelset, sigfillset, sigismember): New macros. - (sigaddset, sigemptyset): Add return code. - --2006-04-13 Ralf Corsepius <ralf.corsepius@rtems.org> -+2006-04-13 Ralf Corsépius <ralf.corsepius@rtems.org> - - * acinclude.m4: New _NEWLIB_VERSION. - * acinclude.m4(NEWLIB_CONFIGURE): AC_REQUIRE(_NEWLIB_VERSION). -@@ -7737,7 +7935,7 @@ - * libc/sys/linux/sys/stat.h: Change *stat64 prototypes to - take a pointer to struct stat64 rather than struct stat. - --2005-12-16 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-12-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Prefer long over int for int32_t. - Use __have_long32 to set up int32_t. -@@ -7766,7 +7964,7 @@ - * libc/include/sys/types.h: Remove the ifdef armour around - standard POSIX types. - --2005-12-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-12-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/crt0.c: Add rtems_gxx_key_create, - rtems_gxx_key_delete, rtems_gxx_getspecific, -@@ -7845,7 +8043,7 @@ - * libc/sys/linux/sys/unistd.h (readlink, symlink): New - prototypes. - --2005-11-01 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-11-01 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Cleanup #if vs. #ifdef. - -@@ -8069,11 +8267,11 @@ - * libc/stdlib/mallocr.c (mALLOc, rEALLOCc, mEMALIGn): Set errno - to ENOMEM on failure. - --2005-10-06 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Add [u]int_fast<N>_t types. - --2005-10-04 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-04 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Move magic to set __have_long* to the - beginning. Use #if __have* instead of #if defined(__have*). -@@ -8089,14 +8287,14 @@ - * libc/sys/linux/include/stdint.h: Include <sys/types.h> and - incorporate Ralf's change below. - --2005-10-03 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-10-03 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: - Use __INTMAX_TYPE__ to derive intmax_t. - Use __UINTMAX_TYPE__ to derive uintmax_t. - Fix minor typo. - --2005-09-27 Ralf Corsepius <ralf.corsepius@rtems.org> -+2005-09-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/stdint.h: Correct __STDINT_EXP macro incorrectly - handling GCC >= 4. -@@ -8432,16 +8630,16 @@ - * configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add - -DCOMPACT_CTYPE. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/sys/rtems/include/inttypes.h: New file. - * libc/sys/rtems/include/stdint.h: Ditto. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/string/memcmp.c: Fix to avoid pointer signedness warning. - --2005-03-06 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-03-06 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/machine/_types.h: New file. - * libc/include/sys/types.h: Do not check for __rtems__ -@@ -8450,7 +8648,7 @@ - * libc/sys/rtems/machine/_types.h: Removed. Replaced with - shared header file. - --2005-02-25 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add - L qualifier for these long constants. -@@ -8466,13 +8664,13 @@ - * libc/time/strftime.c (strftime): Fix '%x' to deal with negative - years. Fix '%z' to use long, not int. - --2005-02-24 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-24 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libm/common/s_fpclassify.c: Use __uint32_t instead of int to - manipulate float values in integer form. - * libm/common/sf_round.c: Ditto. - --2005-02-24 Ralf Corsepious <ralf.corsepius@rtems.org> -+2005-02-24 Ralf Corsépius <ralf.corsepius@rtems.org> - - * libc/include/sys/types.h [__rtems__]: Include new - header file machine/_types.h. -@@ -8836,7 +9034,7 @@ - * libc/stdio/fread.c (fread): Fix return value for unbuffered - fread. - --2004-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2004-10-25 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/include/machine/setjmp.h: Add AVR support. - * libc/sys/rtems/crt0.S [__AVR__]: Add __stack. -@@ -15068,7 +15266,7 @@ - - * libc/include/sys/unistd.h: Prototype chroot() for RTEMS. - --2001-08-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2001-08-29 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/machine/i386/f_atan2.S, libc/machine/i386/f_atan2f.S, - libc/machine/i386/f_exp.c, libc/machine/i386/f_expf.c, -@@ -15745,7 +15943,7 @@ - * libc/sys/linux/sys/utsname.h: Ditto. - * libc/sys/linux/sys/wait.h: Ditto. - --2000-12-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+2000-12-08 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: $(INSTALL), $(INSTALL_DATA), and $(INSTALL_PROGRAM) - can be a relative path to $(top_srcdir)/install.sh so ensure the -@@ -16650,7 +16848,7 @@ - * libc/include/stdlib.h: add ptsname, grantpt, unlockpt to cygwin - section - --Sat Oct 2 02:02:00 MEST 1999 Ralf Corsepius <corsepiu@faw.uni-ulm.de> -+Sat Oct 2 02:02:00 MEST 1999 Ralf Corsépius <corsepiu@faw.uni-ulm.de> - - * libc/machine/sh/asm.h: Added __SH4_SINGLE__ to DELAYED_BRANCHES - * libc/machine/sh/memcpy.S: Fix line wrapping in SL macro -diff -Naur newlib-1.19.0.orig/newlib/ChangeLog.rtems newlib-1.19.0/newlib/ChangeLog.rtems ---- newlib-1.19.0.orig/newlib/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.19.0/newlib/ChangeLog.rtems 2011-04-22 23:54:49.682333226 +0200 -@@ -0,0 +1,83 @@ -+2011-01-07 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/open_memstream.c: Replace 64 * 1024 with 0x10000 to -+ avoid integer overflow on h8300. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/stdio/tmpnam.c: Include <stdint.h>. -+ Use intptr_t instead of _POINTER_INT for improved portability. -+ * libc/misc/__dprintf.c: Include <stdint.h> -+ Use intptr_t instead of _POINTER_INT for improved portability. -+ -+2011-01-05 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/common/s_round.c: Cast const int to __int32_t. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libm/math/e_scalb.c: Include <limits.h>. -+ Don't rely on 65000 being a valid int. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/posix/readdir.c: Include <stdint.h>. -+ Cast to intptr_t instead of int. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/memccpy.c, libc/string/memchr.c, -+ libc/string/memcmp.c, libc/string/memcpy.c, -+ libc/string/memmove.c, libc/string/mempcpy.c, -+ libc/string/memset.c, libc/string/stpcpy.c, -+ libc/string/stpncpy.c, libc/string/strcpy.c, -+ libc/string/strlen.c, libc/string/strncat.c, -+ libc/string/strncpy.c (UNALIGNED): -+ Include <stdint.h>. -+ Cast to intptr_t instead of long. -+ -+2011-01-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * Makefile.am: Don't install include/rpc/*.h. -+ * Makefile.in: Regenerate. -+ * libc/Makefile.am: Install include/rpc/xdr.h include/rpc/types.h. -+ * libc/Makefile.in: Regenerate. -+ -+2010-12-30 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/signal.h: Don't provide sighandler_t. -+ -+2010-12-29 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/sys/dir.h: Remove. -+ -+2010-08-10 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ PR 1475/newlib: -+ * libc/include/stdint.h: Fall back to compute SIZE_MAX based on -+ __SIZEOF_SIZE_T__ and __CHAR_BIT__ if available. -+ -+2010-08-04 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/strcat.c: -+ Include <stdint.h>. Use uintptr_t instead of long in ALIGNED. -+ * libc/string/strchr.c, libc/string/strcmp.c, libc/string/strncmp.c: -+ Include <stdint.h>. Use uintptr_t instead of long in UNALIGNED. -+ -+2010-07-08 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/string/index.c, libc/string/rindex.c: Include <string.h>. -+ * libc/stdlib/putenv_r.c: Include <strings.h> -+ -+2010-03-25 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/include/string.h: Remove bcmp, bcopy, bzero, ffs, index, rindex, -+ strcasecmp, strncasecmp (Moved to strings.h). -+ Remove strcmpi, stricmp, strncmpi, strnicmp. -+ * libc/misc/ffs.c: Use <strings.h> instead of <string.h>. -+ * libc/string/bcmp.c: Use <strings.h> instead of <string.h>. -+ * libc/string/bzero.c: Use <strings.h> instead of <string.h>. -+ * libc/string/rindex.c: Use <strings.h> instead of <string.h>. -+ * libc/string/strcasecmp.c: Use <strings.h> instead of <string.h>. -+ * libc/string/strncasecmp.c: Use <strings.h> instead of <string.h>. -+ -diff -Naur newlib-1.19.0.orig/newlib/doc/makedoc.c newlib-1.19.0/newlib/doc/makedoc.c ---- newlib-1.19.0.orig/newlib/doc/makedoc.c 2009-03-25 22:16:04.000000000 +0100 -+++ newlib-1.19.0/newlib/doc/makedoc.c 2011-04-22 23:54:49.688333002 +0200 -@@ -57,7 +57,7 @@ - { - char *ptr; - unsigned int write_idx; -- unsigned int size; -+ size_t size; - } string_type; - - -@@ -68,7 +68,7 @@ - - static void DEFUN(init_string_with_size,(buffer, size), - string_type *buffer AND -- unsigned int size ) -+ size_t size ) - { - buffer->write_idx = 0; - buffer->size = size; -@@ -219,8 +219,8 @@ - stinst_type *pc; - stinst_type sstack[STACK]; - stinst_type *ssp = &sstack[0]; --int istack[STACK]; --int *isp = &istack[0]; -+long istack[STACK]; -+long *isp = &istack[0]; - - typedef int *word_type; - -@@ -270,7 +270,7 @@ - { - isp++; - pc++; -- *isp = (int)(*pc); -+ *isp = (long)(*pc); - pc++; - - } -diff -Naur newlib-1.19.0.orig/newlib/libc/configure newlib-1.19.0/newlib/libc/configure ---- newlib-1.19.0.orig/newlib/libc/configure 2010-12-16 22:58:39.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/configure 2011-04-22 23:54:49.709332218 +0200 -@@ -625,7 +625,10 @@ - HAVE_XDR_DIR_TRUE - LIBC_XDR_DEF - LIBC_XDR_LIB -+HAVE_POSIX_DIR_FALSE -+HAVE_POSIX_DIR_TRUE - LIBC_POSIX_DEF -+LIBC_POSIX_LIB - HAVE_STDIO64_DIR_FALSE - HAVE_STDIO64_DIR_TRUE - LIBC_STDIO64_DEF -@@ -638,9 +641,6 @@ - HAVE_SIGNAL_DIR_TRUE - LIBC_SIGNAL_DEF - LIBC_SIGNAL_LIB --HAVE_POSIX_DIR_FALSE --HAVE_POSIX_DIR_TRUE --LIBC_POSIX_LIB - CRT0 - subdirs - CPP -@@ -11805,24 +11805,6 @@ - - - --LIBC_POSIX_LIB= --if test -n "${posix_dir}"; then -- if test "${use_libtool}" = "yes"; then -- LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext} -- else -- LIBC_POSIX_LIB=${posix_dir}/lib.${aext} -- fi --fi -- -- if test x${posix_dir} != x; then -- HAVE_POSIX_DIR_TRUE= -- HAVE_POSIX_DIR_FALSE='#' --else -- HAVE_POSIX_DIR_TRUE='#' -- HAVE_POSIX_DIR_FALSE= --fi -- -- - LIBC_SIGNAL_LIB= - LIBC_SIGNAL_DEF= - if test -n "${signal_dir}"; then -@@ -12225,10 +12207,6 @@ - as_fn_error "conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${HAVE_POSIX_DIR_TRUE}" && test -z "${HAVE_POSIX_DIR_FALSE}"; then -- as_fn_error "conditional \"HAVE_POSIX_DIR\" was never defined. --Usually this means the macro was only invoked conditionally." "$LINENO" 5 --fi - if test -z "${HAVE_SIGNAL_DIR_TRUE}" && test -z "${HAVE_SIGNAL_DIR_FALSE}"; then - as_fn_error "conditional \"HAVE_SIGNAL_DIR\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff -Naur newlib-1.19.0.orig/newlib/libc/configure.in newlib-1.19.0/newlib/libc/configure.in ---- newlib-1.19.0.orig/newlib/libc/configure.in 2010-04-23 01:32:40.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/configure.in 2011-04-22 23:54:49.711332144 +0200 -@@ -41,17 +41,6 @@ - dnl for the library and an automake conditional for whether we should - dnl build the library. - --LIBC_POSIX_LIB= --if test -n "${posix_dir}"; then -- if test "${use_libtool}" = "yes"; then -- LIBC_POSIX_LIB=${posix_dir}/lib${posix_dir}.${aext} -- else -- LIBC_POSIX_LIB=${posix_dir}/lib.${aext} -- fi --fi --AC_SUBST(LIBC_POSIX_LIB) --AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x) -- - LIBC_SIGNAL_LIB= - LIBC_SIGNAL_DEF= - if test -n "${signal_dir}"; then -diff -Naur newlib-1.19.0.orig/newlib/libc/include/inttypes.h newlib-1.19.0/newlib/libc/include/inttypes.h ---- newlib-1.19.0.orig/newlib/libc/include/inttypes.h 2009-01-19 23:02:06.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/inttypes.h 2011-04-22 23:54:49.713332068 +0200 -@@ -242,15 +242,17 @@ - #define SCNxMAX __SCNMAX(x) - - /* ptr types */ --#if __have_long64 --#define __PRIPTR(x) __STRINGIFY(l##x) --#define __SCNPTR(x) __STRINGIFY(l##x) --#elif __have_longlong64 --#define __PRIPTR(x) __STRINGIFY(ll##x) --#define __SCNPTR(x) __STRINGIFY(ll##x) -+#if INTPTR_MAX == INT64_MAX -+#define __PRIPTR(x) __PRI64(x) -+#define __SCNPTR(x) __SCN64(x) -+#elif INTPTR_MAX == INT32_MAX -+#define __PRIPTR(x) __PRI32(x) -+#define __SCNPTR(x) __SCN32(x) -+#elif INTPTR_MAX == INT16_MAX -+#define __PRIPTR(x) __PRI16(x) -+#define __SCNPTR(x) __SCN16(x) - #else --#define __PRIPTR(x) __STRINGIFY(x) --#define __SCNPTR(x) __STRINGIFY(x) -+#error cannot determine PRI*PTR - #endif - - #define PRIdPTR __PRIPTR(d) -diff -Naur newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h newlib-1.19.0/newlib/libc/include/machine/_default_types.h ---- newlib-1.19.0.orig/newlib/libc/include/machine/_default_types.h 2008-06-12 00:14:54.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/machine/_default_types.h 2011-04-22 23:54:49.714332030 +0200 -@@ -54,14 +54,14 @@ - #endif - #endif - --#if __EXP(INT_MAX) == 0x7fffffffL --typedef signed int __int32_t; --typedef unsigned int __uint32_t; --#define ___int32_t_defined 1 --#elif __EXP(LONG_MAX) == 0x7fffffffL -+#if __EXP(LONG_MAX) == 0x7fffffffL - typedef signed long __int32_t; - typedef unsigned long __uint32_t; - #define ___int32_t_defined 1 -+#elif __EXP(INT_MAX) == 0x7fffffffL -+typedef signed int __int32_t; -+typedef unsigned int __uint32_t; -+#define ___int32_t_defined 1 - #elif __EXP(SHRT_MAX) == 0x7fffffffL - typedef signed short __int32_t; - typedef unsigned short __uint32_t; -diff -Naur newlib-1.19.0.orig/newlib/libc/include/signal.h newlib-1.19.0/newlib/libc/include/signal.h ---- newlib-1.19.0.orig/newlib/libc/include/signal.h 2010-07-13 13:18:55.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/signal.h 2011-04-22 23:54:49.715331993 +0200 -@@ -7,9 +7,6 @@ - _BEGIN_STD_C - - typedef int sig_atomic_t; /* Atomic entity type (ANSI) */ --#ifndef _POSIX_SOURCE --typedef _sig_func_ptr sighandler_t; /* glibc naming */ --#endif /* !_POSIX_SOURCE */ - - #define SIG_DFL ((_sig_func_ptr)0) /* Default action */ - #define SIG_IGN ((_sig_func_ptr)1) /* Ignore action */ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdint.h newlib-1.19.0/newlib/libc/include/stdint.h ---- newlib-1.19.0.orig/newlib/libc/include/stdint.h 2009-04-24 23:55:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/stdint.h 2011-04-22 23:54:49.718331882 +0200 -@@ -33,7 +33,7 @@ - /* Check if "long" is 64bit or 32bit wide */ - #if __STDINT_EXP(LONG_MAX) > 0x7fffffff - #define __have_long64 1 --#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__) -+#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff - #define __have_long32 1 - #endif - -@@ -49,14 +49,14 @@ - #define __int_least8_t_defined 1 - #endif - --#if __STDINT_EXP(SHRT_MAX) == 0x7fff --typedef signed short int16_t; --typedef unsigned short uint16_t; --#define __int16_t_defined 1 --#elif __STDINT_EXP(INT_MAX) == 0x7fff -+#if __STDINT_EXP(INT_MAX) == 0x7fff - typedef signed int int16_t; - typedef unsigned int uint16_t; - #define __int16_t_defined 1 -+#elif __STDINT_EXP(SHRT_MAX) == 0x7fff -+typedef signed short int16_t; -+typedef unsigned short uint16_t; -+#define __int16_t_defined 1 - #elif __STDINT_EXP(SCHAR_MAX) == 0x7fff - typedef signed char int16_t; - typedef unsigned char uint16_t; -@@ -239,6 +239,29 @@ - * GCC doesn't provide an appropriate macro for [u]intptr_t - * For now, use __PTRDIFF_TYPE__ - */ -+#if defined(__SIZEOF_POINTER__) -+#if __SIZEOF_POINTER__ == 8 -+ typedef int64_t intptr_t; -+ typedef uint64_t uintptr_t; -+#define INTPTR_MAX INT64_MAX -+#define INTPTR_MIN INT64_MIN -+#define UINTPTR_MAX UINT64_MAX -+#elif __SIZEOF_POINTER__ == 4 -+ typedef int32_t intptr_t; -+ typedef uint32_t uintptr_t; -+#define INTPTR_MAX INT32_MAX -+#define INTPTR_MIN INT32_MIN -+#define UINTPTR_MAX UINT32_MAX -+#elif __SIZEOF_POINTER__ == 2 -+ typedef int16_t intptr_t; -+ typedef uint16_t uintptr_t; -+#define INTPTR_MAX INT16_MAX -+#define INTPTR_MIN INT16_MIN -+#define UINTPTR_MAX UINT16_MAX -+#else -+#error cannot determine intptr_t -+#endif -+#else - #if defined(__PTRDIFF_TYPE__) - typedef signed __PTRDIFF_TYPE__ intptr_t; - typedef unsigned __PTRDIFF_TYPE__ uintptr_t; -@@ -260,6 +283,7 @@ - #define INTPTR_MIN (-__STDINT_EXP(LONG_MAX) - 1) - #define UINTPTR_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1) - #endif -+#endif - - /* Limits of Specified-Width Integer Types */ - -@@ -408,6 +432,8 @@ - /* This must match size_t in stddef.h, currently long unsigned int */ - #ifdef __SIZE_MAX__ - #define SIZE_MAX __SIZE_MAX__ -+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__) -+#define SIZE_MAX (((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1) * 2 + 1) - #else - #define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1) - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdio.h newlib-1.19.0/newlib/libc/include/stdio.h ---- newlib-1.19.0.orig/newlib/libc/include/stdio.h 2010-02-26 10:41:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/stdio.h 2011-04-22 23:54:49.720331807 +0200 -@@ -308,7 +308,7 @@ - * Routines in POSIX 1003.1:2001. - */ - --#ifndef __STRICT_ANSI__ -+#if (!defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)) - #ifndef _REENT_ONLY - FILE * _EXFUN(fdopen, (int, const char *)); - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/include/stdlib.h newlib-1.19.0/newlib/libc/include/stdlib.h ---- newlib-1.19.0.orig/newlib/libc/include/stdlib.h 2010-07-19 20:21:11.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/stdlib.h 2011-04-22 23:54:49.722331731 +0200 -@@ -38,7 +38,7 @@ - long rem; /* remainder */ - } ldiv_t; - --#ifndef __STRICT_ANSI__ -+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) - typedef struct - { - long long int quot; /* quotient */ -@@ -63,13 +63,12 @@ - int _EXFUN(abs,(int)); - int _EXFUN(atexit,(_VOID (*__func)(_VOID))); - double _EXFUN(atof,(const char *__nptr)); --#ifndef __STRICT_ANSI__ --float _EXFUN(atoff,(const char *__nptr)); --#endif - int _EXFUN(atoi,(const char *__nptr)); --int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr)); - long _EXFUN(atol,(const char *__nptr)); -+#ifndef __STRICT_ANSI__ -+int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr)); - long _EXFUN(_atol_r,(struct _reent *, const char *__nptr)); -+#endif /* ! __STRICT_ANSI__ */ - _PTR _EXFUN(bsearch,(const _PTR __key, - const _PTR __base, - size_t __nmemb, -@@ -80,10 +79,10 @@ - _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn))); - _VOID _EXFUN_NOTHROW(free,(_PTR)); - char * _EXFUN(getenv,(const char *__string)); -+#ifndef __STRICT_ANSI__ - char * _EXFUN(_getenv_r,(struct _reent *, const char *__string)); - char * _EXFUN(_findenv,(_CONST char *, int *)); - char * _EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *)); --#ifndef __STRICT_ANSI__ - extern char *suboptarg; /* getsubopt(3) external variable */ - int _EXFUN(getsubopt,(char **, char * const *, char **)); - #endif -@@ -91,16 +90,16 @@ - ldiv_t _EXFUN(ldiv,(long __numer, long __denom)); - _PTR _EXFUN_NOTHROW(malloc,(size_t __size)); - int _EXFUN(mblen,(const char *, size_t)); --int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *)); - int _EXFUN(mbtowc,(wchar_t *, const char *, size_t)); --int _EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); - int _EXFUN(wctomb,(char *, wchar_t)); --int _EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *)); - size_t _EXFUN(mbstowcs,(wchar_t *, const char *, size_t)); --size_t _EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); - size_t _EXFUN(wcstombs,(char *, const wchar_t *, size_t)); --size_t _EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *)); - #ifndef __STRICT_ANSI__ -+int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *)); -+int _EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); -+int _EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *)); -+size_t _EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *)); -+size_t _EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *)); - #ifndef _REENT_ONLY - char * _EXFUN(mkdtemp,(char *)); - int _EXFUN(mkostemp,(char *, int)); -@@ -133,10 +132,11 @@ - # endif - #endif - long _EXFUN(strtol,(const char *__n, char **__end_PTR, int __base)); --long _EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); - unsigned long _EXFUN(strtoul,(const char *__n, char **__end_PTR, int __base)); -+#ifndef __STRICT_ANSI__ - unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); -- -+long _EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base)); -+#endif /* !__STRICT_ANSI__ */ - int _EXFUN(system,(const char *__string)); - - #ifndef __STRICT_ANSI__ -@@ -163,33 +163,39 @@ - int _EXFUN(rand_r,(unsigned *__seed)); - - double _EXFUN(drand48,(_VOID)); --double _EXFUN(_drand48_r,(struct _reent *)); - double _EXFUN(erand48,(unsigned short [3])); --double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3])); - long _EXFUN(jrand48,(unsigned short [3])); --long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3])); - _VOID _EXFUN(lcong48,(unsigned short [7])); --_VOID _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7])); - long _EXFUN(lrand48,(_VOID)); --long _EXFUN(_lrand48_r,(struct _reent *)); - long _EXFUN(mrand48,(_VOID)); --long _EXFUN(_mrand48_r,(struct _reent *)); - long _EXFUN(nrand48,(unsigned short [3])); --long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3])); - unsigned short * - _EXFUN(seed48,(unsigned short [3])); -+_VOID _EXFUN(srand48,(long)); -+long long _EXFUN(atoll,(const char *__nptr)); -+#ifndef __STRICT_ANSI__ -+double _EXFUN(_drand48_r,(struct _reent *)); -+double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3])); -+long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3])); -+_VOID _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7])); -+long _EXFUN(_lrand48_r,(struct _reent *)); -+long _EXFUN(_mrand48_r,(struct _reent *)); -+long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3])); - unsigned short * - _EXFUN(_seed48_r,(struct _reent *, unsigned short [3])); --_VOID _EXFUN(srand48,(long)); - _VOID _EXFUN(_srand48_r,(struct _reent *, long)); --long long _EXFUN(atoll,(const char *__nptr)); - long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr)); -+#endif /* ! __STRICT_ANSI__ */ -+#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) - long long _EXFUN(llabs,(long long)); - lldiv_t _EXFUN(lldiv,(long long __numer, long long __denom)); - long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base)); --long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); - unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base)); -+#endif -+#ifndef __STRICT_ANSI__ -+long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); - unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); -+#endif /* ! __STRICT_ANSI__ */ - - #ifndef __CYGWIN__ - _VOID _EXFUN(cfree,(_PTR)); -@@ -203,6 +209,7 @@ - - #endif /* ! __STRICT_ANSI__ */ - -+#ifndef __STRICT_ANSI__ - char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**)); - #ifndef __CYGWIN__ - _PTR _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t)); -@@ -214,6 +221,7 @@ - int _EXFUN(_system_r,(struct _reent *, const char *)); - - _VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *)); -+#endif /* ! __STRICT_ANSI__ */ - - /* On platforms where long double equals double. */ - #ifdef _LDBL_EQ_DBL -diff -Naur newlib-1.19.0.orig/newlib/libc/include/string.h newlib-1.19.0/newlib/libc/include/string.h ---- newlib-1.19.0.orig/newlib/libc/include/string.h 2008-06-18 17:27:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/string.h 2011-04-22 23:54:49.723331694 +0200 -@@ -9,6 +9,7 @@ - - #include "_ansi.h" - #include <sys/reent.h> -+#include <sys/cdefs.h> - - #define __need_size_t - #include <stddef.h> -@@ -49,52 +50,41 @@ - #ifndef __STRICT_ANSI__ - char *_EXFUN(strtok_r,(char *, const char *, char **)); - --int _EXFUN(bcmp,(const void *, const void *, size_t)); --void _EXFUN(bcopy,(const void *, void *, size_t)); --void _EXFUN(bzero,(void *, size_t)); --int _EXFUN(ffs,(int)); --char *_EXFUN(index,(const char *, int)); - _PTR _EXFUN(memccpy,(_PTR, const _PTR, int, size_t)); - _PTR _EXFUN(mempcpy,(_PTR, const _PTR, size_t)); - _PTR _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t)); --char *_EXFUN(rindex,(const char *, int)); - char *_EXFUN(stpcpy,(char *, const char *)); - char *_EXFUN(stpncpy,(char *, const char *, size_t)); --int _EXFUN(strcasecmp,(const char *, const char *)); - char *_EXFUN(strcasestr,(const char *, const char *)); - char *_EXFUN(strdup,(const char *)); - char *_EXFUN(_strdup_r,(struct _reent *, const char *)); - char *_EXFUN(strndup,(const char *, size_t)); - char *_EXFUN(_strndup_r,(struct _reent *, const char *, size_t)); --char *_EXFUN(strerror_r,(int, char *, size_t)); -+/* There are two common strerror_r variants. If you request -+ _GNU_SOURCE, you get the GNU version; otherwise you get the POSIX -+ version. POSIX requires that #undef strerror_r will still let you -+ invoke the underlying function, but that requires gcc support. */ -+#ifdef _GNU_SOURCE -+char *_EXFUN(strerror_r,(int, char *, size_t)); -+#else -+# ifdef __GNUC__ -+int _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r")); -+# else -+int _EXFUN(__xpg_strerror_r,(int, char *, size_t)); -+# define strerror_r __xpg_strerror_r -+# endif -+#endif - size_t _EXFUN(strlcat,(char *, const char *, size_t)); - size_t _EXFUN(strlcpy,(char *, const char *, size_t)); --int _EXFUN(strncasecmp,(const char *, const char *, size_t)); - size_t _EXFUN(strnlen,(const char *, size_t)); - char *_EXFUN(strsep,(char **, const char *)); - char *_EXFUN(strlwr,(char *)); - char *_EXFUN(strupr,(char *)); -+char *_EXFUN(strsignal, (int __signo)); - #ifdef __CYGWIN__ --#ifndef DEFS_H /* Kludge to work around problem compiling in gdb */ --char *_EXFUN(strsignal, (int __signo)); --#endif - int _EXFUN(strtosigno, (const char *__name)); - #endif - --/* These function names are used on Windows and perhaps other systems. */ --#ifndef strcmpi --#define strcmpi strcasecmp --#endif --#ifndef stricmp --#define stricmp strcasecmp --#endif --#ifndef strncmpi --#define strncmpi strncasecmp --#endif --#ifndef strnicmp --#define strnicmp strncasecmp --#endif -- - #endif /* ! __STRICT_ANSI__ */ - - #include <sys/string.h> -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h newlib-1.19.0/newlib/libc/include/sys/cdefs.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/cdefs.h 2002-06-20 21:51:24.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/cdefs.h 2011-04-22 23:54:49.725331620 +0200 -@@ -58,6 +58,27 @@ - #define __DOTS , ... - #define __THROW - -+/* -+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g. -+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. -+ * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI -+ * mode -- there must be no spaces between its arguments, and for nested -+ * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also -+ * concatenate double-quoted strings produced by the __STRING macro, but -+ * this only works with ANSI C. -+ * -+ * __XSTRING is like __STRING, but it expands any macros in its argument -+ * first. It is only available with ANSI C. -+ */ -+#define __CONCAT1(x,y) x ## y -+#define __CONCAT(x,y) __CONCAT1(x,y) -+#define __STRING(x) #x /* stringify without expanding x */ -+#define __XSTRING(x) __STRING(x) /* expand x, then stringify */ -+ -+#ifdef __GNUC__ -+# define __ASMNAME(cname) __XSTRING (__USER_LABEL_PREFIX__) cname -+#endif -+ - #define __ptr_t void * - #define __long_double_t long double - -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/_default_fcntl.h 2010-01-14 19:49:13.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/sys/_default_fcntl.h 2011-04-22 23:54:49.724331657 +0200 -@@ -51,8 +51,6 @@ - #define O_BINARY _FBINARY - #define O_TEXT _FTEXT - #define O_NOINHERIT _FNOINHERIT --/* O_CLOEXEC is the Linux equivalent to O_NOINHERIT */ --#define O_CLOEXEC _FNOINHERIT - - /* The windows header files define versions with a leading underscore. */ - #define _O_RDONLY O_RDONLY -@@ -124,9 +122,6 @@ - #define F_CNVT 12 /* Convert a fhandle to an open fd */ - #define F_RSETLKW 13 /* Set or Clear remote record-lock(Blocking) */ - #endif /* !_POSIX_SOURCE */ --#ifdef __CYGWIN__ --#define F_DUPFD_CLOEXEC 14 /* As F_DUPFD, but set close-on-exec flag */ --#endif - - /* fcntl(2) flags (l_type field of flock structure) */ - #define F_RDLCK 1 /* read lock */ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/dir.h newlib-1.19.0/newlib/libc/include/sys/dir.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/dir.h 2010-08-11 20:14:54.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/dir.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,10 +0,0 @@ --/* BSD predecessor of POSIX.1 <dirent.h> and struct dirent */ -- --#ifndef _SYS_DIR_H_ --#define _SYS_DIR_H_ -- --#include <dirent.h> -- --#define direct dirent -- --#endif /*_SYS_DIR_H_*/ -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/features.h newlib-1.19.0/newlib/libc/include/sys/features.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/features.h 2010-08-09 10:29:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/sys/features.h 2011-04-22 23:54:49.736331209 +0200 -@@ -15,7 +15,7 @@ - * OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS - * SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - * -- * $Id$ -+ * $Id$ - */ - - #ifndef _SYS_FEATURES_H -@@ -178,6 +178,12 @@ - /* #define _XOPEN_UNIX -1 */ - - #endif /* !__STRICT_ANSI__ || __cplusplus || __STDC_VERSION__ >= 199901L */ -+ -+/* The value corresponds to UNICODE version 4.0, which is the version -+ supported by XP. Newlib supports 5.2 (2011) but so far Cygwin needs -+ the MS conversions for double-byte charsets. */ -+#define __STDC_ISO_10646__ 200305L -+ - #endif /* __CYGWIN__ */ - - /* Per the permission given in POSIX.1-2008 section 2.2.1, define -diff -Naur newlib-1.19.0.orig/newlib/libc/include/sys/types.h newlib-1.19.0/newlib/libc/include/sys/types.h ---- newlib-1.19.0.orig/newlib/libc/include/sys/types.h 2010-12-08 15:44:06.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/include/sys/types.h 2011-04-22 23:54:49.738331133 +0200 -@@ -98,6 +98,7 @@ - - typedef unsigned short ushort; /* System V compatibility */ - typedef unsigned int uint; /* System V compatibility */ -+typedef unsigned long ulong; /* System V compatibility */ - # endif /*!_POSIX_SOURCE */ - - #ifndef __clock_t_defined -diff -Naur newlib-1.19.0.orig/newlib/libc/include/wchar.h newlib-1.19.0/newlib/libc/include/wchar.h ---- newlib-1.19.0.orig/newlib/libc/include/wchar.h 2009-10-15 10:23:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/include/wchar.h 2011-04-22 23:54:49.739331096 +0200 -@@ -16,6 +16,9 @@ - /* For _mbstate_t definition. */ - #include <sys/_types.h> - -+/* For __STDC_ISO_10646__ */ -+#include <sys/features.h> -+ - #ifndef NULL - #define NULL 0 - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S ---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S 2010-02-08 18:24:22.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S 2011-04-22 23:54:49.740331059 +0200 -@@ -15,7 +15,7 @@ - - #include "m68kasm.h" - --#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__) -+#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__) - # define MISALIGNED_OK 1 - #else - # define MISALIGNED_OK 0 -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c newlib-1.19.0/newlib/libc/machine/mips/strlen.c ---- newlib-1.19.0.orig/newlib/libc/machine/mips/strlen.c 2002-03-14 03:41:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/mips/strlen.c 2011-04-22 23:54:49.741331022 +0200 -@@ -60,6 +60,9 @@ - " addiu $2,$4,1\n" - "\n" - "1: lbu $3,0($4)\n" -+#if defined(_R3000) -+ " nop \n" -+#endif - " bnez $3,1b\n" - " addiu $4,$4,1\n" - "\n" -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.am 2007-05-24 19:33:35.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.am 2011-04-22 23:54:49.742330985 +0200 -@@ -10,7 +10,7 @@ - - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib - --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS=$(AM_CCASFLAGS) - lib_a_CFLAGS=$(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/Makefile.in 2010-12-16 22:58:53.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/Makefile.in 2011-04-22 23:54:49.744330910 +0200 -@@ -51,7 +51,7 @@ - LIBRARIES = $(noinst_LIBRARIES) - ARFLAGS = cru - lib_a_AR = $(AR) $(ARFLAGS) --am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT) -+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) - lib_a_OBJECTS = $(am_lib_a_OBJECTS) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = -@@ -174,7 +174,7 @@ - AM_CCASFLAGS = $(INCLUDES) - noinst_LIBRARIES = lib.a - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS = $(AM_CCASFLAGS) - lib_a_CFLAGS = $(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -@@ -185,7 +185,7 @@ - all: all-am - - .SUFFIXES: --.SUFFIXES: .S .c .o .obj -+.SUFFIXES: .S .o .obj - am--refresh: - @: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -@@ -246,18 +246,6 @@ - lib_a-setjmp.obj: setjmp.S - $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi` - --.c.o: -- $(COMPILE) -c $< -- --.c.obj: -- $(COMPILE) -c `$(CYGPATH_W) '$<'` -- --lib_a-times.o: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c -- --lib_a-times.obj: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi` -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -diff -Naur newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.19.0/newlib/libc/machine/powerpc/times.c ---- newlib-1.19.0.orig/newlib/libc/machine/powerpc/times.c 2002-07-22 22:26:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/machine/powerpc/times.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,36 +0,0 @@ --/* Time support routines for PowerPC. -- * -- * Written by Aldy Hernandez. -- */ -- --#include <_ansi.h> --#include <reent.h> --#include <sys/time.h> --#include <sys/times.h> --#include <sys/resource.h> -- --clock_t --times (struct tms *tp) --{ -- struct rusage usage; -- union { -- struct rusage r; -- /* Newlib's rusage has only 2 fields. We need to make room for -- when we call the system's rusage. This should be enough. */ -- int filler[32]; -- } host_ru; -- -- getrusage (RUSAGE_SELF, (void *)&host_ru); -- -- if (tp) -- { -- tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000 -- + host_ru.r.ru_utime.tv_usec; -- tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000 -- + host_ru.r.ru_stime.tv_usec; -- tp->tms_cutime = 0; /* user time, children */ -- tp->tms_cstime = 0; /* system time, children */ -- } -- -- return tp->tms_utime; --} -diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.am newlib-1.19.0/newlib/libc/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/Makefile.am 2010-05-07 01:25:16.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/Makefile.am 2011-04-22 23:54:49.689332964 +0200 -@@ -36,6 +36,8 @@ - - if HAVE_XDR_DIR - XDR_SUBDIR = xdr -+rpcincludedir = $(tooldir) -+nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h - endif - - # The order of SUBDIRS is important for the integrated documentation. -@@ -140,8 +142,7 @@ - locale/stmp-def \ - reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ -- misc/stmp-def \ -- posix/stmp-def -+ misc/stmp-def - - libc.info: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) -diff -Naur newlib-1.19.0.orig/newlib/libc/Makefile.in newlib-1.19.0/newlib/libc/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/Makefile.in 2010-12-16 22:58:39.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/Makefile.in 2011-04-22 23:54:49.692332853 +0200 -@@ -17,6 +17,7 @@ - - - -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -39,7 +40,8 @@ - subdir = . - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ -- $(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) -+ $(srcdir)/../../mkinstalldirs $(libc_TEXINFOS) \ -+ $(am__nobase_rpcinclude_HEADERS_DIST) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ - $(top_srcdir)/../../ltoptions.m4 \ -@@ -155,6 +157,10 @@ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - DATA = $(noinst_DATA) -+am__nobase_rpcinclude_HEADERS_DIST = include/rpc/xdr.h \ -+ include/rpc/types.h -+am__installdirs = "$(DESTDIR)$(rpcincludedir)" -+HEADERS = $(nobase_rpcinclude_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -319,6 +325,8 @@ - @ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_LIBS = - @ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext) - @HAVE_XDR_DIR_TRUE@XDR_SUBDIR = xdr -+@HAVE_XDR_DIR_TRUE@rpcincludedir = $(tooldir) -+@HAVE_XDR_DIR_TRUE@nobase_rpcinclude_HEADERS = include/rpc/xdr.h include/rpc/types.h - - # The order of SUBDIRS is important for the integrated documentation. - # Do not change the order without considering the doc impact. -@@ -396,8 +404,7 @@ - locale/stmp-def \ - reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ -- misc/stmp-def \ -- posix/stmp-def -+ misc/stmp-def - - info_TEXINFOS = libc.texinfo - libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \ -@@ -638,6 +645,29 @@ - done - - clean-info: mostlyclean-aminfo clean-aminfo -+install-nobase_rpcincludeHEADERS: $(nobase_rpcinclude_HEADERS) -+ @$(NORMAL_INSTALL) -+ test -z "$(rpcincludedir)" || $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)" -+ @list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \ -+ $(am__nobase_list) | while read dir files; do \ -+ xfiles=; for file in $$files; do \ -+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \ -+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ -+ test -z "$$xfiles" || { \ -+ test "x$$dir" = x. || { \ -+ echo "$(MKDIR_P) '$(DESTDIR)$(rpcincludedir)/$$dir'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(rpcincludedir)/$$dir"; }; \ -+ echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(rpcincludedir)/$$dir'"; \ -+ $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(rpcincludedir)/$$dir" || exit $$?; }; \ -+ done -+ -+uninstall-nobase_rpcincludeHEADERS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(nobase_rpcinclude_HEADERS)'; test -n "$(rpcincludedir)" || list=; \ -+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ -+ test -n "$$files" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(rpcincludedir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(rpcincludedir)" && rm -f $$files - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. -@@ -775,9 +805,12 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - check-am: - check: check-recursive --all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) -+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: -+ for dir in "$(DESTDIR)$(rpcincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -827,7 +860,7 @@ - - info-am: $(INFO_DEPS) - --install-data-am: -+install-data-am: install-nobase_rpcincludeHEADERS - - install-dvi: install-dvi-recursive - -@@ -952,7 +985,8 @@ - ps-am: $(PSS) - - uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ -- uninstall-pdf-am uninstall-ps-am -+ uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \ -+ uninstall-ps-am - - .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive -@@ -966,14 +1000,16 @@ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -- maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ -- mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ -- uninstall-info-am uninstall-pdf-am uninstall-ps-am -+ install-man install-nobase_rpcincludeHEADERS install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-aminfo \ -+ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-dvi-am uninstall-html-am uninstall-info-am \ -+ uninstall-nobase_rpcincludeHEADERS uninstall-pdf-am \ -+ uninstall-ps-am - - @USE_LIBTOOL_FALSE@libc.a: $(SUBLIBS) - @USE_LIBTOOL_FALSE@ rm -f $@ -diff -Naur newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c newlib-1.19.0/newlib/libc/misc/__dprintf.c ---- newlib-1.19.0.orig/newlib/libc/misc/__dprintf.c 2008-12-11 18:27:55.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/misc/__dprintf.c 2011-04-22 23:54:49.746330834 +0200 -@@ -5,6 +5,7 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include "ctype.h" - #include "reent.h" - #include "string.h" -@@ -131,7 +132,7 @@ - write_string (unctrl (c)); - break; - case 'p' : -- l = (_POINTER_INT) va_arg (args, char *); -+ l = (intptr_t) va_arg (args, char *); - print_number (16, 1, l); - break; - case 'd' : -diff -Naur newlib-1.19.0.orig/newlib/libc/misc/ffs.c newlib-1.19.0/newlib/libc/misc/ffs.c ---- newlib-1.19.0.orig/newlib/libc/misc/ffs.c 2003-06-06 21:57:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/misc/ffs.c 2011-04-22 23:54:49.747330797 +0200 -@@ -6,9 +6,11 @@ - ffs - - ANSI_SYNOPSIS -+ #include <strings.h> - int ffs(int <[word]>); - - TRAD_SYNOPSIS -+ #include <strings.h> - int ffs(<[word]>); - - DESCRIPTION -@@ -24,7 +26,7 @@ - - No supporting OS subroutines are required. */ - --#include <_ansi.h> -+#include <strings.h> - - int - _DEFUN(ffs, (word), -diff -Naur newlib-1.19.0.orig/newlib/libc/posix/readdir.c newlib-1.19.0/newlib/libc/posix/readdir.c ---- newlib-1.19.0.orig/newlib/libc/posix/readdir.c 2003-06-06 21:57:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/posix/readdir.c 2011-04-22 23:54:49.748330760 +0200 -@@ -37,6 +37,7 @@ - static char sccsid[] = "@(#)readdir.c 5.7 (Berkeley) 6/1/90"; - #endif /* LIBC_SCCS and not lint */ - -+#include <stdint.h> - #include <dirent.h> - - extern int getdents (int fd, void *dp, int count); -@@ -75,7 +76,7 @@ - continue; - } - dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc); -- if ((int)dp & 03) { /* bogus pointer check */ -+ if ((intptr_t)dp & 03) { /* bogus pointer check */ - #ifdef HAVE_DD_LOCK - __lock_release_recursive(dirp->dd_lock); - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/search/db_local.h newlib-1.19.0/newlib/libc/search/db_local.h ---- newlib-1.19.0.orig/newlib/libc/search/db_local.h 2010-03-05 09:55:15.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/search/db_local.h 2011-04-22 23:54:49.749330723 +0200 -@@ -102,11 +102,11 @@ - typedef struct __db { - DBTYPE type; /* Underlying db type. */ - int (*close)(struct __db *); -- int (*del)(const struct __db *, const DBT *, u_int); -- int (*get)(const struct __db *, const DBT *, DBT *, u_int); -- int (*put)(const struct __db *, DBT *, const DBT *, u_int); -- int (*seq)(const struct __db *, DBT *, DBT *, u_int); -- int (*sync)(const struct __db *, u_int); -+ int (*del)(const struct __db *, const DBT *, __uint32_t); -+ int (*get)(const struct __db *, const DBT *, DBT *, __uint32_t); -+ int (*put)(const struct __db *, DBT *, const DBT *, __uint32_t); -+ int (*seq)(const struct __db *, DBT *, DBT *, __uint32_t); -+ int (*sync)(const struct __db *, __uint32_t); - void *internal; /* Access method private. */ - int (*fd)(const struct __db *); - } DB; -diff -Naur newlib-1.19.0.orig/newlib/libc/search/extern.h newlib-1.19.0/newlib/libc/search/extern.h ---- newlib-1.19.0.orig/newlib/libc/search/extern.h 2002-06-20 21:51:31.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/extern.h 2011-04-22 23:54:49.750330686 +0200 -@@ -43,7 +43,7 @@ - int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, __uint32_t, SPLIT_RETURN *); - int __buf_free(HTAB *, int, int); --void __buf_init(HTAB *, int); -+void __buf_init(HTAB *, __uint32_t); - __uint32_t __call_hash(HTAB *, char *, int); - int __delpair(HTAB *, BUFHEAD *, int); - int __expand_table(HTAB *); -diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash_buf.c newlib-1.19.0/newlib/libc/search/hash_buf.c ---- newlib-1.19.0.orig/newlib/libc/search/hash_buf.c 2004-05-26 19:57:10.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/hash_buf.c 2011-04-22 23:54:49.752330611 +0200 -@@ -118,7 +118,7 @@ - int newpage; /* If prev_bp set, indicates a new overflow page. */ - { - BUFHEAD *bp; -- __uint32_t is_disk_mask; -+ ptrdiff_t is_disk_mask; - int is_disk, segment_ndx; - SEGMENT segp; - -@@ -298,7 +298,7 @@ - extern void - __buf_init(hashp, nbytes) - HTAB *hashp; -- int nbytes; -+ __uint32_t nbytes; - { - BUFHEAD *bfp; - int npages; -diff -Naur newlib-1.19.0.orig/newlib/libc/search/hash.h newlib-1.19.0/newlib/libc/search/hash.h ---- newlib-1.19.0.orig/newlib/libc/search/hash.h 2008-07-02 20:38:45.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/search/hash.h 2011-04-22 23:54:49.751330649 +0200 -@@ -82,7 +82,7 @@ - - /* Hash Table Information */ - typedef struct hashhdr { /* Disk resident portion */ -- int magic; /* Magic NO for hash tables */ -+ __uint32_t magic; /* Magic NO for hash tables */ - int version; /* Version ID */ - __uint32_t lorder; /* Byte Order */ - int bsize; /* Bucket/Page Size */ -@@ -97,7 +97,7 @@ - int high_mask; /* Mask to modulo into entire table */ - int low_mask; /* Mask to modulo into lower half of - * table */ -- int ffactor; /* Fill factor */ -+ __uint32_t ffactor; /* Fill factor */ - int nkeys; /* Number of keys in hash table */ - int hdrpages; /* Size of table header */ - int h_charkey; /* value of hash(CHARKEY) */ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fclose.c newlib-1.19.0/newlib/libc/stdio/fclose.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fclose.c 2007-07-13 22:37:53.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fclose.c 2011-04-22 23:54:49.753330573 +0200 -@@ -74,8 +74,6 @@ - if (fp == NULL) - return (0); /* on NULL */ - -- __sfp_lock_acquire (); -- - CHECK_INIT (rptr, fp); - - _flockfile (fp); -@@ -83,7 +81,6 @@ - if (fp->_flags == 0) /* not open! */ - { - _funlockfile (fp); -- __sfp_lock_release (); - return (0); - } - /* Unconditionally flush to allow special handling for seekable read -@@ -98,6 +95,7 @@ - FREEUB (rptr, fp); - if (HASLB (fp)) - FREELB (rptr, fp); -+ __sfp_lock_acquire (); - fp->_flags = 0; /* release this FILE for reuse */ - _funlockfile (fp); - #ifndef __SINGLE_THREAD__ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fflush.c newlib-1.19.0/newlib/libc/stdio/fflush.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fflush.c 2009-10-30 09:26:41.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fflush.c 2011-04-22 23:54:49.755330498 +0200 -@@ -67,37 +67,16 @@ - - /* Flush a single file, or (if fp is NULL) all files. */ - -+/* Core function which does not lock file pointer. This gets called -+ directly from __srefill. */ - int --_DEFUN(_fflush_r, (ptr, fp), -+_DEFUN(__sflush_r, (ptr, fp), - struct _reent *ptr _AND - register FILE * fp) - { - register unsigned char *p; - register int n, t; - --#ifdef _REENT_SMALL -- /* For REENT_SMALL platforms, it is possible we are being -- called for the first time on a std stream. This std -- stream can belong to a reentrant struct that is not -- _REENT. If CHECK_INIT gets called below based on _REENT, -- we will end up changing said file pointers to the equivalent -- std stream off of _REENT. This causes unexpected behavior if -- there is any data to flush on the _REENT std stream. There -- are two alternatives to fix this: 1) make a reentrant fflush -- or 2) simply recognize that this file has nothing to flush -- and return immediately before performing a CHECK_INIT. Choice -- 2 is implemented here due to its simplicity. */ -- if (fp->_bf._base == NULL) -- return 0; --#endif /* _REENT_SMALL */ -- -- CHECK_INIT (ptr, fp); -- -- if (!fp->_flags) -- return 0; -- -- _flockfile (fp); -- - t = fp->_flags; - if ((t & __SWR) == 0) - { -@@ -150,7 +129,6 @@ - } - else - fp->_flags |= __SERR; -- _funlockfile (fp); - return result; - } - } -@@ -186,17 +164,14 @@ - else - { - fp->_flags |= __SERR; -- _funlockfile (fp); - return EOF; - } - } -- _funlockfile (fp); - return 0; - } - if ((p = fp->_bf._base) == NULL) - { - /* Nothing to flush. */ -- _funlockfile (fp); - return 0; - } - n = fp->_p - p; /* write this much */ -@@ -215,16 +190,48 @@ - if (t <= 0) - { - fp->_flags |= __SERR; -- _funlockfile (fp); - return EOF; - } - p += t; - n -= t; - } -- _funlockfile (fp); - return 0; - } - -+int -+_DEFUN(_fflush_r, (ptr, fp), -+ struct _reent *ptr _AND -+ register FILE * fp) -+{ -+ int ret; -+ -+#ifdef _REENT_SMALL -+ /* For REENT_SMALL platforms, it is possible we are being -+ called for the first time on a std stream. This std -+ stream can belong to a reentrant struct that is not -+ _REENT. If CHECK_INIT gets called below based on _REENT, -+ we will end up changing said file pointers to the equivalent -+ std stream off of _REENT. This causes unexpected behavior if -+ there is any data to flush on the _REENT std stream. There -+ are two alternatives to fix this: 1) make a reentrant fflush -+ or 2) simply recognize that this file has nothing to flush -+ and return immediately before performing a CHECK_INIT. Choice -+ 2 is implemented here due to its simplicity. */ -+ if (fp->_bf._base == NULL) -+ return 0; -+#endif /* _REENT_SMALL */ -+ -+ CHECK_INIT (ptr, fp); -+ -+ if (!fp->_flags) -+ return 0; -+ -+ _flockfile (fp); -+ ret = __sflush_r (ptr, fp); -+ _funlockfile (fp); -+ return ret; -+} -+ - #ifndef _REENT_ONLY - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c newlib-1.19.0/newlib/libc/stdio/fgetc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetc.c 2009-04-25 00:52:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetc.c 2011-04-22 23:54:49.755330498 +0200 -@@ -93,11 +93,9 @@ - #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) - int result; - CHECK_INIT(_REENT, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (_REENT, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - #else - return _fgetc_r (_REENT, fp); -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgets.c newlib-1.19.0/newlib/libc/stdio/fgets.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgets.c 2009-04-25 00:52:51.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgets.c 2011-04-22 23:54:49.756330461 +0200 -@@ -98,7 +98,6 @@ - - CHECK_INIT(ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - #ifdef __SCLE - if (fp->_flags & __SCLE) -@@ -114,12 +113,10 @@ - if (c == EOF && s == buf) - { - _funlockfile (fp); -- __sfp_lock_release (); - return NULL; - } - *s = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return buf; - } - #endif -@@ -138,7 +135,6 @@ - if (s == buf) - { - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - break; -@@ -164,7 +160,6 @@ - _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); - s[len] = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return (buf); - } - fp->_r -= len; -@@ -175,7 +170,6 @@ - while ((n -= len) != 0); - *s = 0; - _funlockfile (fp); -- __sfp_lock_release (); - return buf; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c newlib-1.19.0/newlib/libc/stdio/fgetwc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetwc.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetwc.c 2011-04-22 23:54:49.758330387 +0200 -@@ -164,12 +164,10 @@ - { - wint_t r; - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT(fp, 1); - r = __fgetwc (ptr, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return r; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c newlib-1.19.0/newlib/libc/stdio/fgetws.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fgetws.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fgetws.c 2011-04-22 23:54:49.759330350 +0200 -@@ -93,7 +93,6 @@ - const char *src; - unsigned char *nl; - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT (fp, 1); - -@@ -144,12 +143,10 @@ - goto error; - *wsp++ = L'\0'; - _funlockfile (fp); -- __sfp_lock_release (); - return ws; - - error: - _funlockfile (fp); -- __sfp_lock_release (); - return NULL; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c newlib-1.19.0/newlib/libc/stdio/fmemopen.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fmemopen.c 2007-08-02 22:23:06.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fmemopen.c 2011-04-22 23:54:49.760330312 +0200 -@@ -281,7 +281,7 @@ - - if ((flags = __sflags (ptr, mode, &dummy)) == 0) - return NULL; -- if (!size || !(buf || flags & __SAPP)) -+ if (!size || !(buf || flags & __SRW)) - { - ptr->_errno = EINVAL; - return NULL; -@@ -310,7 +310,7 @@ - { - /* r+/w+/a+, and no buf: file starts empty. */ - c->buf = (char *) (c + 1); -- *(char *) buf = '\0'; -+ c->buf[0] = '\0'; - c->pos = c->eof = 0; - c->append = (flags & __SAPP) != 0; - } -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fread.c newlib-1.19.0/newlib/libc/stdio/fread.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fread.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/fread.c 2011-04-22 23:54:49.762330236 +0200 -@@ -146,7 +146,6 @@ - - CHECK_INIT(ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - ORIENT (fp, -1); - if (fp->_r < 0) -@@ -197,12 +196,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r (ptr, fp, buf, total-resid, 1) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return (total - resid) / size; - } - } -@@ -224,12 +221,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r (ptr, fp, buf, total-resid, 1) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return (total - resid) / size; - } - } -@@ -243,12 +238,10 @@ - if (fp->_flags & __SCLE) - { - _funlockfile (fp); -- __sfp_lock_release (); - return crlf_r(ptr, fp, buf, total, 0) / size; - } - #endif - _funlockfile (fp); -- __sfp_lock_release (); - return count; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/freopen.c newlib-1.19.0/newlib/libc/stdio/freopen.c ---- newlib-1.19.0.orig/newlib/libc/stdio/freopen.c 2008-12-12 16:45:19.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/freopen.c 2011-04-22 23:54:49.764330162 +0200 -@@ -98,8 +98,6 @@ - int flags, oflags; - int e = 0; - -- __sfp_lock_acquire (); -- - CHECK_INIT (ptr, fp); - - _flockfile (fp); -@@ -108,7 +106,6 @@ - { - _funlockfile (fp); - _fclose_r (ptr, fp); -- __sfp_lock_release (); - return NULL; - } - -@@ -208,6 +205,7 @@ - - if (f < 0) - { /* did not get it after all */ -+ __sfp_lock_acquire (); - fp->_flags = 0; /* set it free */ - ptr->_errno = e; /* restore in case _close clobbered */ - _funlockfile (fp); -@@ -232,7 +230,6 @@ - #endif - - _funlockfile (fp); -- __sfp_lock_release (); - return fp; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fseek.c newlib-1.19.0/newlib/libc/stdio/fseek.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fseek.c 2009-12-17 20:43:43.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fseek.c 2011-04-22 23:54:49.766330088 +0200 -@@ -138,7 +138,6 @@ - - CHECK_INIT (ptr, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - - /* If we've been doing some writing, and we're in append mode -@@ -156,7 +155,6 @@ - { - ptr->_errno = ESPIPE; /* ??? */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - -@@ -182,7 +180,6 @@ - if (curoff == -1L) - { - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - } -@@ -208,7 +205,6 @@ - default: - ptr->_errno = EINVAL; - _funlockfile (fp); -- __sfp_lock_release (); - return (EOF); - } - -@@ -268,7 +264,6 @@ - { - ptr->_errno = EOVERFLOW; - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - -@@ -325,7 +320,6 @@ - fp->_flags &= ~__SEOF; - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - -@@ -356,7 +350,6 @@ - } - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - - /* -@@ -369,7 +362,6 @@ - || seekfn (ptr, fp->_cookie, offset, whence) == POS_ERR) - { - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - } - /* success: clear EOF indicator and discard ungetc() data */ -@@ -388,7 +380,6 @@ - fp->_flags &= ~__SNPT; - memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); - _funlockfile (fp); -- __sfp_lock_release (); - return 0; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c newlib-1.19.0/newlib/libc/stdio/fwalk.c ---- newlib-1.19.0.orig/newlib/libc/stdio/fwalk.c 2009-01-12 23:19:11.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/fwalk.c 2011-04-22 23:54:49.768330013 +0200 -@@ -27,8 +27,8 @@ - #include <errno.h> - #include "local.h" - --static int --_DEFUN(__fwalk, (ptr, function), -+int -+_DEFUN(_fwalk, (ptr, function), - struct _reent *ptr _AND - register int (*function) (FILE *)) - { -@@ -36,11 +36,19 @@ - register int n, ret = 0; - register struct _glue *g; - -+ /* -+ * It should be safe to walk the list without locking it; -+ * new nodes are only added to the end and none are ever -+ * removed. -+ * -+ * Avoid locking this list while walking it or else you will -+ * introduce a potential deadlock in [at least] refill.c. -+ */ - for (g = &ptr->__sglue; g != NULL; g = g->_next) - for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++) - if (fp->_flags != 0) - { -- if (fp->_flags != 0 && fp->_file != -1) -+ if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1) - ret |= (*function) (fp); - } - -@@ -49,8 +57,8 @@ - - /* Special version of __fwalk where the function pointer is a reentrant - I/O function (e.g. _fclose_r). */ --static int --_DEFUN(__fwalk_reent, (ptr, reent_function), -+int -+_DEFUN(_fwalk_reent, (ptr, reent_function), - struct _reent *ptr _AND - register int (*reent_function) (struct _reent *, FILE *)) - { -@@ -58,51 +66,21 @@ - register int n, ret = 0; - register struct _glue *g; - -+ /* -+ * It should be safe to walk the list without locking it; -+ * new nodes are only added to the end and none are ever -+ * removed. -+ * -+ * Avoid locking this list while walking it or else you will -+ * introduce a potential deadlock in [at least] refill.c. -+ */ - for (g = &ptr->__sglue; g != NULL; g = g->_next) - for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++) - if (fp->_flags != 0) - { -- if (fp->_flags != 0 && fp->_file != -1) -+ if (fp->_flags != 0 && fp->_flags != 1 && fp->_file != -1) - ret |= (*reent_function) (ptr, fp); - } - - return ret; - } -- --int --_DEFUN(_fwalk, (ptr, function), -- struct _reent *ptr _AND -- register int (*function)(FILE *)) --{ -- register int ret = 0; -- -- __sfp_lock_acquire (); -- -- /* Must traverse given list for streams. Note that _GLOBAL_REENT -- only walked once in exit(). */ -- ret |= __fwalk (ptr, function); -- -- __sfp_lock_release (); -- -- return ret; --} -- --/* Special version of _fwalk which handles a function pointer to a -- reentrant I/O function (e.g. _fclose_r). */ --int --_DEFUN(_fwalk_reent, (ptr, reent_function), -- struct _reent *ptr _AND -- register int (*reent_function) (struct _reent *, FILE *)) --{ -- register int ret = 0; -- -- __sfp_lock_acquire (); -- -- /* Must traverse given list for streams. Note that _GLOBAL_REENT -- only walked once in exit(). */ -- ret |= __fwalk_reent (ptr, reent_function); -- -- __sfp_lock_release (); -- -- return ret; --} -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getc.c newlib-1.19.0/newlib/libc/stdio/getc.c ---- newlib-1.19.0.orig/newlib/libc/stdio/getc.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/getc.c 2011-04-22 23:54:49.769329975 +0200 -@@ -92,11 +92,9 @@ - { - int result; - CHECK_INIT (ptr, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (ptr, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - } - -@@ -108,11 +106,9 @@ - { - int result; - CHECK_INIT (_REENT, fp); -- __sfp_lock_acquire (); - _flockfile (fp); - result = __sgetc_r (_REENT, fp); - _funlockfile (fp); -- __sfp_lock_release (); - return result; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c newlib-1.19.0/newlib/libc/stdio/getdelim.c ---- newlib-1.19.0.orig/newlib/libc/stdio/getdelim.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/getdelim.c 2011-04-22 23:54:49.771329900 +0200 -@@ -81,7 +81,6 @@ - - CHECK_INIT (_REENT, fp); - -- __sfp_lock_acquire (); - _flockfile (fp); - - numbytes = *n; -@@ -131,7 +130,6 @@ - } - - _funlockfile (fp); -- __sfp_lock_release (); - - /* if no input data, return failure */ - if (ptr == buf) -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/gets.c newlib-1.19.0/newlib/libc/stdio/gets.c ---- newlib-1.19.0.orig/newlib/libc/stdio/gets.c 2009-04-25 00:52:52.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/gets.c 2011-04-22 23:54:49.774329789 +0200 -@@ -79,14 +79,12 @@ - register int c; - register char *s = buf; - -- __sfp_lock_acquire (); - _flockfile (stdin); - while ((c = __sgetc_r (ptr, stdin)) != '\n') - if (c == EOF) - if (s == buf) - { - _funlockfile (stdin); -- __sfp_lock_release (); - return NULL; - } - else -@@ -95,7 +93,6 @@ - *s++ = c; - *s = 0; - _funlockfile (stdin); -- __sfp_lock_release (); - return buf; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/local.h newlib-1.19.0/newlib/libc/stdio/local.h ---- newlib-1.19.0.orig/newlib/libc/stdio/local.h 2009-04-22 10:30:03.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/local.h 2011-04-22 23:54:49.777329676 +0200 -@@ -54,6 +54,7 @@ - va_list)); - extern FILE *_EXFUN(__sfp,(struct _reent *)); - extern int _EXFUN(__sflags,(struct _reent *,_CONST char*, int*)); -+extern int _EXFUN(__sflush_r,(struct _reent *,FILE *)); - extern int _EXFUN(__srefill_r,(struct _reent *,FILE *)); - extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *, - int)); -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c newlib-1.19.0/newlib/libc/stdio/open_memstream.c ---- newlib-1.19.0.orig/newlib/libc/stdio/open_memstream.c 2009-02-25 05:00:05.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/open_memstream.c 2011-04-22 23:54:49.778329638 +0200 -@@ -330,8 +330,10 @@ - c->max *= sizeof(wchar_t); - if (c->max < 64) - c->max = 64; -- else if (c->max > 64 * 1024) -- c->max = 64 * 1024; -+#if (SIZE_MAX >= 0x10000) -+ else if (c->max > 0x10000) -+ c->max = 0x10000; -+#endif - *size = 0; - *buf = _malloc_r (ptr, c->max); - if (!*buf) -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/refill.c newlib-1.19.0/newlib/libc/stdio/refill.c ---- newlib-1.19.0.orig/newlib/libc/stdio/refill.c 2008-12-11 00:43:12.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/refill.c 2011-04-22 23:54:49.780329564 +0200 -@@ -102,9 +102,19 @@ - * flush all line buffered output files, per the ANSI C - * standard. - */ -- - if (fp->_flags & (__SLBF | __SNBF)) -- _CAST_VOID _fwalk (_GLOBAL_REENT, lflush); -+ { -+ /* Ignore this file in _fwalk to avoid potential deadlock. */ -+ short orig_flags = fp->_flags; -+ fp->_flags = 1; -+ _CAST_VOID _fwalk (_GLOBAL_REENT, lflush); -+ fp->_flags = orig_flags; -+ -+ /* Now flush this file without locking it. */ -+ if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) -+ __sflush_r (ptr, fp); -+ } -+ - fp->_p = fp->_bf._base; - fp->_r = fp->_read (ptr, fp->_cookie, (char *) fp->_p, fp->_bf._size); - #ifndef __CYGWIN__ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c newlib-1.19.0/newlib/libc/stdio/tmpnam.c ---- newlib-1.19.0.orig/newlib/libc/stdio/tmpnam.c 2004-04-23 22:01:55.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio/tmpnam.c 2011-04-22 23:54:49.781329527 +0200 -@@ -94,6 +94,7 @@ - #include <_ansi.h> - #include <reent.h> - #include <stdio.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <fcntl.h> -@@ -109,7 +110,7 @@ - char *result _AND - _CONST char *part1 _AND - _CONST char *part2 _AND -- int part3 _AND -+ intptr_t part3 _AND - int *part4) - { - /* Generate the filename and make sure that there isn't one called -@@ -183,7 +184,7 @@ - if (filename) - { - if (! worker (p, filename, dir, prefix, -- _getpid_r (p) ^ (int) (_POINTER_INT) p, &p->_inc)) -+ _getpid_r (p) ^ (intptr_t) p, &p->_inc)) - return NULL; - } - return filename; -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c newlib-1.19.0/newlib/libc/stdio/vfscanf.c ---- newlib-1.19.0.orig/newlib/libc/stdio/vfscanf.c 2010-01-20 00:16:45.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/vfscanf.c 2011-04-22 23:54:49.784329415 +0200 -@@ -494,7 +494,6 @@ - # define GET_ARG(n, ap, type) (va_arg (ap, type)) - #endif - -- __sfp_lock_acquire (); - _flockfile (fp); - - ORIENT (fp, -1); -@@ -795,7 +794,6 @@ - */ - case '\0': /* compat */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - - default: /* compat */ -@@ -1596,13 +1594,11 @@ - invalid format string), return EOF if no matches yet, else number - of matches made prior to failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF; - match_failure: - all_done: - /* Return number of matches, which can be 0 on match failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c newlib-1.19.0/newlib/libc/stdio/vfwscanf.c ---- newlib-1.19.0.orig/newlib/libc/stdio/vfwscanf.c 2009-03-11 12:53:22.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdio/vfwscanf.c 2011-04-22 23:54:49.786329339 +0200 -@@ -434,7 +434,6 @@ - # define GET_ARG(n, ap, type) (va_arg (ap, type)) - #endif - -- __sfp_lock_acquire (); - _flockfile (fp); - - ORIENT (fp, 1); -@@ -714,7 +713,6 @@ - */ - case L'\0': /* compat */ - _funlockfile (fp); -- __sfp_lock_release (); - return EOF; - - default: /* compat */ -@@ -1443,13 +1441,11 @@ - invalid format string), return EOF if no matches yet, else number - of matches made prior to failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned && !(fp->_flags & __SERR) ? nassigned : EOF; - match_failure: - all_done: - /* Return number of matches, which can be 0 on match failure. */ - _funlockfile (fp); -- __sfp_lock_release (); - return nassigned; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c newlib-1.19.0/newlib/libc/stdio64/freopen64.c ---- newlib-1.19.0.orig/newlib/libc/stdio64/freopen64.c 2007-07-13 22:37:53.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdio64/freopen64.c 2011-04-22 23:54:49.787329302 +0200 -@@ -97,7 +97,6 @@ - int flags, oflags; - int e = 0; - -- __sfp_lock_acquire (); - - CHECK_INIT (ptr, fp); - -@@ -107,7 +106,6 @@ - { - _funlockfile(fp); - _fclose_r (ptr, fp); -- __sfp_lock_release (); - return NULL; - } - -@@ -204,6 +202,7 @@ - - if (f < 0) - { /* did not get it after all */ -+ __sfp_lock_acquire (); - fp->_flags = 0; /* set it free */ - ptr->_errno = e; /* restore in case _close clobbered */ - _funlockfile(fp); -@@ -231,7 +230,6 @@ - fp->_flags |= __SL64; - - _funlockfile(fp); -- __sfp_lock_release (); - return fp; - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atof.c newlib-1.19.0/newlib/libc/stdlib/atof.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/atof.c 2003-10-20 20:46:37.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdlib/atof.c 2011-04-22 23:54:49.794329040 +0200 -@@ -1,6 +1,6 @@ - /* - FUNCTION -- <<atof>>, <<atoff>>---string to double or float -+ <<atof>> ---string to double - - INDEX - atof -@@ -10,19 +10,14 @@ - ANSI_SYNOPSIS - #include <stdlib.h> - double atof(const char *<[s]>); -- float atoff(const char *<[s]>); - - TRAD_SYNOPSIS - #include <stdlib.h> - double atof(<[s]>) - char *<[s]>; - -- float atoff(<[s]>) -- char *<[s]>; -- - DESCRIPTION - <<atof>> converts the initial portion of a string to a <<double>>. --<<atoff>> converts the initial portion of a string to a <<float>>. - - The functions parse the character string <[s]>, - locating a substring which can be converted to a floating-point -@@ -36,7 +31,6 @@ - something other than <<+>>, <<->>, <<.>>, or a digit. - - <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>. --<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>. - - RETURNS - <<atof>> returns the converted substring value, if any, as a -@@ -47,12 +41,9 @@ - If the correct value would cause underflow, <<0.0>> is returned - and <<ERANGE>> is stored in <<errno>>. - --<<atoff>> obeys the same rules as <<atof>>, except that it --returns a <<float>>. -- - PORTABILITY --<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strod>> --and <<strol>>, but are used extensively in existing code. These functions are -+<<atof>> is ANSI C. <<atof>>, <<atoi>>, and <<atol>> are subsumed by <<strtod>> -+and <<strtol>>, but are used extensively in existing code. These functions are - less reliable, but may be faster if the argument is verified to be in a valid - range. - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c newlib-1.19.0/newlib/libc/stdlib/atoff.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/atoff.c 2002-12-06 19:58:51.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/atoff.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,9 +0,0 @@ --#include <stdlib.h> --#include <_ansi.h> -- --float --_DEFUN (atoff, (s), -- _CONST char *s) --{ -- return strtof (s, NULL); --} -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am newlib-1.19.0/newlib/libc/stdlib/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.am 2009-04-16 20:24:35.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.am 2011-04-22 23:54:49.788329265 +0200 -@@ -16,7 +16,6 @@ - assert.c \ - atexit.c \ - atof.c \ -- atoff.c \ - atoi.c \ - atol.c \ - calloc.c \ -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in newlib-1.19.0/newlib/libc/stdlib/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/stdlib/Makefile.in 2010-12-16 22:59:03.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/Makefile.in 2011-04-22 23:54:49.792329116 +0200 -@@ -69,8 +69,7 @@ - lib_a-__ten_mu.$(OBJEXT) lib_a-_Exit.$(OBJEXT) \ - lib_a-abort.$(OBJEXT) lib_a-abs.$(OBJEXT) \ - lib_a-assert.$(OBJEXT) lib_a-atexit.$(OBJEXT) \ -- lib_a-atof.$(OBJEXT) lib_a-atoff.$(OBJEXT) \ -- lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \ -+ lib_a-atof.$(OBJEXT) lib_a-atoi.$(OBJEXT) lib_a-atol.$(OBJEXT) \ - lib_a-calloc.$(OBJEXT) lib_a-div.$(OBJEXT) \ - lib_a-dtoa.$(OBJEXT) lib_a-dtoastub.$(OBJEXT) \ - lib_a-environ.$(OBJEXT) lib_a-envlock.$(OBJEXT) \ -@@ -132,15 +131,15 @@ - @HAVE_LONG_DOUBLE_TRUE@am__objects_8 = strtold.lo wcstold.lo - am__objects_9 = __adjust.lo __atexit.lo __call_atexit.lo __exp10.lo \ - __ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo atexit.lo \ -- atof.lo atoff.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo \ -- dtoastub.lo environ.lo envlock.lo eprintf.lo exit.lo \ -- gdtoa-gethex.lo gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo \ -- ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \ -- mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \ -- mstats.lo rand.lo rand_r.lo realloc.lo reallocf.lo \ -- sb_charsets.lo strtod.lo strtol.lo strtoul.lo wcstod.lo \ -- wcstol.lo wcstoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \ -- wctomb_r.lo $(am__objects_8) -+ atof.lo atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \ -+ environ.lo envlock.lo eprintf.lo exit.lo gdtoa-gethex.lo \ -+ gdtoa-hexnan.lo getenv.lo getenv_r.lo labs.lo ldiv.lo ldtoa.lo \ -+ malloc.lo mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \ -+ mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo rand.lo \ -+ rand_r.lo realloc.lo reallocf.lo sb_charsets.lo strtod.lo \ -+ strtol.lo strtoul.lo wcstod.lo wcstol.lo wcstoul.lo \ -+ wcstombs.lo wcstombs_r.lo wctomb.lo wctomb_r.lo \ -+ $(am__objects_8) - am__objects_10 = cxa_atexit.lo cxa_finalize.lo drand48.lo ecvtbuf.lo \ - efgcvt.lo erand48.lo jrand48.lo lcong48.lo lrand48.lo \ - mrand48.lo msize.lo mtrim.lo nrand48.lo rand48.lo seed48.lo \ -@@ -330,13 +329,13 @@ - INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - GENERAL_SOURCES = __adjust.c __atexit.c __call_atexit.c __exp10.c \ - __ten_mu.c _Exit.c abort.c abs.c assert.c atexit.c atof.c \ -- atoff.c atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c \ -- environ.c envlock.c eprintf.c exit.c gdtoa-gethex.c \ -- gdtoa-hexnan.c getenv.c getenv_r.c labs.c ldiv.c ldtoa.c \ -- malloc.c mblen.c mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c \ -- mbtowc_r.c mlock.c mprec.c mstats.c rand.c rand_r.c realloc.c \ -- reallocf.c sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c \ -- wcstol.c wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \ -+ atoi.c atol.c calloc.c div.c dtoa.c dtoastub.c environ.c \ -+ envlock.c eprintf.c exit.c gdtoa-gethex.c gdtoa-hexnan.c \ -+ getenv.c getenv_r.c labs.c ldiv.c ldtoa.c malloc.c mblen.c \ -+ mblen_r.c mbstowcs.c mbstowcs_r.c mbtowc.c mbtowc_r.c mlock.c \ -+ mprec.c mstats.c rand.c rand_r.c realloc.c reallocf.c \ -+ sb_charsets.c strtod.c strtol.c strtoul.c wcstod.c wcstol.c \ -+ wcstoul.c wcstombs.c wcstombs_r.c wctomb.c wctomb_r.c \ - $(am__append_1) - EXTENDED_SOURCES = \ - cxa_atexit.c \ -@@ -616,12 +615,6 @@ - lib_a-atof.obj: atof.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atof.obj `if test -f 'atof.c'; then $(CYGPATH_W) 'atof.c'; else $(CYGPATH_W) '$(srcdir)/atof.c'; fi` - --lib_a-atoff.o: atoff.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.o `test -f 'atoff.c' || echo '$(srcdir)/'`atoff.c -- --lib_a-atoff.obj: atoff.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoff.obj `if test -f 'atoff.c'; then $(CYGPATH_W) 'atoff.c'; else $(CYGPATH_W) '$(srcdir)/atoff.c'; fi` -- - lib_a-atoi.o: atoi.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-atoi.o `test -f 'atoi.c' || echo '$(srcdir)/'`atoi.c - -diff -Naur newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c newlib-1.19.0/newlib/libc/stdlib/putenv_r.c ---- newlib-1.19.0.orig/newlib/libc/stdlib/putenv_r.c 2004-11-24 23:34:14.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/stdlib/putenv_r.c 2011-04-22 23:54:49.796328966 +0200 -@@ -24,6 +24,7 @@ - #include <reent.h> - #include <stdlib.h> - #include <string.h> -+#include <strings.h> - - #include "envlock.h" - -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcmp.c newlib-1.19.0/newlib/libc/string/bcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/bcmp.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bcmp.c 2011-04-22 23:54:49.801328780 +0200 -@@ -6,11 +6,11 @@ - bcmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int bcmp(<[s1]>, <[s2]>, <[n]>) - const void *<[s1]>; - const void *<[s2]>; -@@ -35,7 +35,7 @@ - bcmp ansi pure - */ - --#include <string.h> -+#include <strings.h> - - int - _DEFUN (bcmp, (m1, m2, n), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bcopy.c newlib-1.19.0/newlib/libc/string/bcopy.c ---- newlib-1.19.0.orig/newlib/libc/string/bcopy.c 2002-05-23 20:46:04.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bcopy.c 2011-04-22 23:54:49.802328742 +0200 -@@ -3,7 +3,7 @@ - <<bcopy>>---copy memory regions - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>); - - TRAD_SYNOPSIS -@@ -26,7 +26,7 @@ - bcopy - pure - */ - --#include <string.h> -+#include <strings.h> - - void - _DEFUN (bcopy, (b1, b2, length), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/bzero.c newlib-1.19.0/newlib/libc/string/bzero.c ---- newlib-1.19.0.orig/newlib/libc/string/bzero.c 2002-05-23 20:46:04.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/bzero.c 2011-04-22 23:54:49.803328704 +0200 -@@ -6,11 +6,11 @@ - bzero - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bzero(void *<[b]>, size_t <[length]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - void bzero(<[b]>, <[length]>) - void *<[b]>; - size_t <[length]>; -@@ -30,7 +30,7 @@ - <<bzero>> requires no supporting OS subroutines. - */ - --#include <string.h> -+#include <strings.h> - - _VOID - _DEFUN (bzero, (b, length), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/index.c newlib-1.19.0/newlib/libc/string/index.c ---- newlib-1.19.0.orig/newlib/libc/string/index.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/index.c 2011-04-22 23:54:49.804328667 +0200 -@@ -6,11 +6,11 @@ - index - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * index(const char *<[string]>, int <[c]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * index(<[string]>, <[c]>); - char *<[string]>; - int *<[c]>; -@@ -33,7 +33,8 @@ - index - pure - */ - --#include <string.h> -+#include <strings.h> -+#include <string.h> /* strchr */ - - char * - _DEFUN (index, (s, c), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.am newlib-1.19.0/newlib/libc/string/Makefile.am ---- newlib-1.19.0.orig/newlib/libc/string/Makefile.am 2010-05-11 22:27:20.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/Makefile.am 2011-04-22 23:54:49.797328929 +0200 -@@ -71,7 +71,8 @@ - wmemcmp.c \ - wmemcpy.c \ - wmemmove.c \ -- wmemset.c -+ wmemset.c \ -+ xpg_strerror_r.c - - if ELIX_LEVEL_1 - ELIX_2_SOURCES = -diff -Naur newlib-1.19.0.orig/newlib/libc/string/Makefile.in newlib-1.19.0/newlib/libc/string/Makefile.in ---- newlib-1.19.0.orig/newlib/libc/string/Makefile.in 2010-12-16 22:59:03.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/Makefile.in 2011-04-22 23:54:49.800328818 +0200 -@@ -88,7 +88,7 @@ - lib_a-wcsxfrm.$(OBJEXT) lib_a-wcwidth.$(OBJEXT) \ - lib_a-wmemchr.$(OBJEXT) lib_a-wmemcmp.$(OBJEXT) \ - lib_a-wmemcpy.$(OBJEXT) lib_a-wmemmove.$(OBJEXT) \ -- lib_a-wmemset.$(OBJEXT) -+ lib_a-wmemset.$(OBJEXT) lib_a-xpg_strerror_r.$(OBJEXT) - @ELIX_LEVEL_1_FALSE@am__objects_2 = lib_a-bcmp.$(OBJEXT) \ - @ELIX_LEVEL_1_FALSE@ lib_a-memccpy.$(OBJEXT) \ - @ELIX_LEVEL_1_FALSE@ lib_a-mempcpy.$(OBJEXT) \ -@@ -120,7 +120,7 @@ - wcslcpy.lo wcslen.lo wcsncat.lo wcsncmp.lo wcsncpy.lo \ - wcsnlen.lo wcspbrk.lo wcsrchr.lo wcsspn.lo wcsstr.lo wcstok.lo \ - wcswidth.lo wcsxfrm.lo wcwidth.lo wmemchr.lo wmemcmp.lo \ -- wmemcpy.lo wmemmove.lo wmemset.lo -+ wmemcpy.lo wmemmove.lo wmemset.lo xpg_strerror_r.lo - @ELIX_LEVEL_1_FALSE@am__objects_5 = bcmp.lo memccpy.lo mempcpy.lo \ - @ELIX_LEVEL_1_FALSE@ stpcpy.lo stpncpy.lo strndup.lo \ - @ELIX_LEVEL_1_FALSE@ strcasestr.lo strndup_r.lo wcpcpy.lo \ -@@ -363,7 +363,8 @@ - wmemcmp.c \ - wmemcpy.c \ - wmemmove.c \ -- wmemset.c -+ wmemset.c \ -+ xpg_strerror_r.c - - @ELIX_LEVEL_1_FALSE@ELIX_2_SOURCES = \ - @ELIX_LEVEL_1_FALSE@ bcmp.c \ -@@ -887,6 +888,12 @@ - lib_a-wmemset.obj: wmemset.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wmemset.obj `if test -f 'wmemset.c'; then $(CYGPATH_W) 'wmemset.c'; else $(CYGPATH_W) '$(srcdir)/wmemset.c'; fi` - -+lib_a-xpg_strerror_r.o: xpg_strerror_r.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.o `test -f 'xpg_strerror_r.c' || echo '$(srcdir)/'`xpg_strerror_r.c -+ -+lib_a-xpg_strerror_r.obj: xpg_strerror_r.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-xpg_strerror_r.obj `if test -f 'xpg_strerror_r.c'; then $(CYGPATH_W) 'xpg_strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/xpg_strerror_r.c'; fi` -+ - lib_a-bcmp.o: bcmp.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-bcmp.o `test -f 'bcmp.c' || echo '$(srcdir)/'`bcmp.c - -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memccpy.c newlib-1.19.0/newlib/libc/string/memccpy.c ---- newlib-1.19.0.orig/newlib/libc/string/memccpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memccpy.c 2011-04-22 23:54:49.805328630 +0200 -@@ -35,13 +35,14 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <stddef.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the word copy loop. */ - #define LITTLEBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memchr.c newlib-1.19.0/newlib/libc/string/memchr.c ---- newlib-1.19.0.orig/newlib/libc/string/memchr.c 2008-05-27 01:31:08.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memchr.c 2011-04-22 23:54:49.806328593 +0200 -@@ -38,10 +38,11 @@ - - #include <_ansi.h> - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ --#define UNALIGNED(X) ((long)X & (sizeof (long) - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (sizeof (long) - 1)) - - /* How many bytes are loaded each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcmp.c newlib-1.19.0/newlib/libc/string/memcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/memcmp.c 2005-03-06 21:40:05.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/memcmp.c 2011-04-22 23:54:49.807328556 +0200 -@@ -37,11 +37,11 @@ - */ - - #include <string.h> -- -+#include <stdint.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memcpy.c newlib-1.19.0/newlib/libc/string/memcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/memcpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memcpy.c 2011-04-22 23:54:49.807328556 +0200 -@@ -34,11 +34,12 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <string.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memmove.c newlib-1.19.0/newlib/libc/string/memmove.c ---- newlib-1.19.0.orig/newlib/libc/string/memmove.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memmove.c 2011-04-22 23:54:49.808328519 +0200 -@@ -36,13 +36,14 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <_ansi.h> - #include <stddef.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/mempcpy.c newlib-1.19.0/newlib/libc/string/mempcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/mempcpy.c 2010-09-22 05:15:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/mempcpy.c 2011-04-22 23:54:49.809328481 +0200 -@@ -34,10 +34,11 @@ - #include <stddef.h> - #include <limits.h> - #include <string.h> -+#include <stdint.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* How many bytes are copied each iteration of the 4X unrolled loop. */ - #define BIGBLOCKSIZE (sizeof (long) << 2) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/memset.c newlib-1.19.0/newlib/libc/string/memset.c ---- newlib-1.19.0.orig/newlib/libc/string/memset.c 2008-05-27 20:44:40.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/memset.c 2011-04-22 23:54:49.810328443 +0200 -@@ -34,9 +34,10 @@ - */ - - #include <string.h> -+#include <stdint.h> - - #define LBLOCKSIZE (sizeof(long)) --#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1)) - #define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE) - - _PTR -diff -Naur newlib-1.19.0.orig/newlib/libc/string/rindex.c newlib-1.19.0/newlib/libc/string/rindex.c ---- newlib-1.19.0.orig/newlib/libc/string/rindex.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/rindex.c 2011-04-22 23:54:49.811328405 +0200 -@@ -10,7 +10,7 @@ - char * rindex(const char *<[string]>, int <[c]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - char * rindex(<[string]>, <[c]>); - char *<[string]>; - int *<[c]>; -@@ -33,7 +33,8 @@ - rindex - pure - */ - --#include <string.h> -+#include <strings.h> -+#include <string.h> /* strchr */ - - char * - _DEFUN (rindex, (s, c), -diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpcpy.c newlib-1.19.0/newlib/libc/string/stpcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/stpcpy.c 2007-06-28 19:07:23.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/stpcpy.c 2011-04-22 23:54:49.812328368 +0200 -@@ -34,6 +34,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -41,7 +42,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/stpncpy.c newlib-1.19.0/newlib/libc/string/stpncpy.c ---- newlib-1.19.0.orig/newlib/libc/string/stpncpy.c 2007-06-28 19:07:23.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/stpncpy.c 2011-04-22 23:54:49.813328331 +0200 -@@ -40,6 +40,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -47,7 +48,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c newlib-1.19.0/newlib/libc/string/strcasecmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strcasecmp.c 2009-04-23 20:11:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strcasecmp.c 2011-04-22 23:54:49.814328294 +0200 -@@ -6,11 +6,11 @@ - strcasecmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strcasecmp(const char *<[a]>, const char *<[b]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strcasecmp(<[a]>, <[b]>) - char *<[a]>; - char *<[b]>; -@@ -38,7 +38,7 @@ - strcasecmp - */ - --#include <string.h> -+#include <strings.h> - #include <ctype.h> - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcat.c newlib-1.19.0/newlib/libc/string/strcat.c ---- newlib-1.19.0.orig/newlib/libc/string/strcat.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strcat.c 2011-04-22 23:54:49.815328257 +0200 -@@ -33,12 +33,13 @@ - strcat ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if X is aligned on a "long" boundary. */ - #define ALIGNED(X) \ -- (((long)X & (sizeof (long) - 1)) == 0) -+ (((uintptr_t)X & (sizeof (long) - 1)) == 0) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strchr.c newlib-1.19.0/newlib/libc/string/strchr.c ---- newlib-1.19.0.orig/newlib/libc/string/strchr.c 2008-05-22 04:31:46.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strchr.c 2011-04-22 23:54:49.816328220 +0200 -@@ -33,11 +33,12 @@ - strchr ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if X is not aligned on a "long" boundary. */ --#define UNALIGNED(X) ((long)X & (sizeof (long) - 1)) -+#define UNALIGNED(X) ((uintptr_t)X & (sizeof (long) - 1)) - - /* How many bytes are loaded each iteration of the word copy loop. */ - #define LBLOCKSIZE (sizeof (long)) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcmp.c newlib-1.19.0/newlib/libc/string/strcmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strcmp.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strcmp.c 2011-04-22 23:54:49.817328182 +0200 -@@ -35,12 +35,13 @@ - strcmp ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ - #if LONG_MAX == 2147483647L -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strcpy.c newlib-1.19.0/newlib/libc/string/strcpy.c ---- newlib-1.19.0.orig/newlib/libc/string/strcpy.c 2007-05-29 23:26:59.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strcpy.c 2011-04-22 23:54:49.818328144 +0200 -@@ -32,6 +32,7 @@ - strcpy ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - -@@ -40,7 +41,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror.c newlib-1.19.0/newlib/libc/string/strerror.c ---- newlib-1.19.0.orig/newlib/libc/string/strerror.c 2009-03-15 14:41:46.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strerror.c 2011-04-22 23:54:49.819328106 +0200 -@@ -301,6 +301,17 @@ - result string; therefore portable code cannot depend on the reentrancy - of this subroutine. - -+Although this implementation of <<strerror>> guarantees a non-null -+result with a NUL-terminator, some implementations return <<NULL>> -+on failure. Although POSIX allows <<strerror>> to set <<errno>> -+to EINVAL on failure, this implementation does not do so (unless -+you provide <<_user_strerror>>). -+ -+POSIX recommends that unknown <[errnum]> result in a message -+including that value, however it is not a requirement and this -+implementation does not provide that information (unless you -+provide <<_user_strerror>>). -+ - This implementation of <<strerror>> provides for user-defined - extensibility. <<errno.h>> defines <[__ELASTERROR]>, which can be - used as a base for user-defined error values. If the user supplies a -@@ -313,6 +324,9 @@ - <<_user_strerror>> returns <[NULL]>. The default <<_user_strerror>> - returns <[NULL]> for all input values. - -+Note that <<_user_sterror>> must be thread-safe and not alter <<errno>> -+if <<strerror_r>> is to comply with POSIX. -+ - <<strerror>> requires no supporting OS subroutines. - - QUICKREF -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strerror_r.c newlib-1.19.0/newlib/libc/string/strerror_r.c ---- newlib-1.19.0.orig/newlib/libc/string/strerror_r.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strerror_r.c 2011-04-22 23:54:49.821328032 +0200 -@@ -1,3 +1,4 @@ -+/* GNU variant of strerror_r. */ - /* - FUNCTION - <<strerror_r>>---convert error number to string and copy to buffer -@@ -7,7 +8,11 @@ - - ANSI_SYNOPSIS - #include <string.h> -+ #ifdef _GNU_SOURCE - char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>); -+ #else -+ int strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>); -+ #endif - - TRAD_SYNOPSIS - #include <string.h> -@@ -19,35 +24,60 @@ - DESCRIPTION - <<strerror_r>> converts the error number <[errnum]> into a - string and copies the result into the supplied <[buffer]> for --a length up to <[n]>, including the NUL terminator. The value of --<[errnum]> is usually a copy of <<errno>>. If <<errnum>> is not a known -+a length up to <[n]>, including the NUL terminator. The value of -+<[errnum]> is usually a copy of <<errno>>. If <<errnum>> is not a known - error number, the result is the empty string. - - See <<strerror>> for how strings are mapped to <<errnum>>. - - RETURNS --This function returns a pointer to a string. Your application must --not modify that string. -+There are two variants: the GNU version always returns a NUL-terminated -+string, which is <[buffer]> if all went well, but which is another -+pointer if <[n]> was too small (leaving <[buffer]> untouched). If the -+return is not <[buffer]>, your application must not modify that string. -+The POSIX version returns 0 on success, <[EINVAL]> if <<errnum>> was not -+recognized, and <[ERANGE]> if <[n]> was too small. The variant chosen -+depends on macros that you define before inclusion of <<string.h>>. - - PORTABILITY --<<strerror_r>> is a GNU extension. -+<<strerror_r>> with a <[char *]> result is a GNU extension. -+<<strerror_r>> with an <[int]> result is required by POSIX 2001. -+This function is compliant only if <<_user_strerror>> is not provided, -+or if it is thread-safe and does not modify <<errno>>. -+ -+POSIX states that the contents of <[buf]> are unspecified on error, -+although this implementation guarantees a NUL-terminated string for -+all except <[n]> of 0. -+ -+POSIX recommends that unknown <[errnum]> result in a message including -+that value, however it is not a requirement and this implementation -+provides only an empty string (unless you provide <<_user_strerror>>). -+POSIX also recommends that unknown <[errnum]> fail with EINVAL even -+when providing such a message, however it is not a requirement and -+this implementation will return success if <<_user_strerror>> provided -+a non-empty alternate string. - - <<strerror_r>> requires no supporting OS subroutines. - - */ - - #undef __STRICT_ANSI__ -+#define _GNU_SOURCE - #include <errno.h> - #include <string.h> -+#undef strerror_r - -+/* For backwards-compatible linking, this must be the GNU signature; -+ see xpg_strerror_r.c for the POSIX version. */ - char * - _DEFUN (strerror_r, (errnum, buffer, n), - int errnum _AND - char *buffer _AND - size_t n) - { -- char *error; -- error = strerror (errnum); -+ char *error = strerror (errnum); - -- return strncpy (buffer, (const char *)error, n); -+ if (strlen (error) >= n) -+ return error; -+ return strcpy (buffer, error); - } -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strlen.c newlib-1.19.0/newlib/libc/string/strlen.c ---- newlib-1.19.0.orig/newlib/libc/string/strlen.c 2008-05-27 00:56:14.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strlen.c 2011-04-22 23:54:49.822327995 +0200 -@@ -32,11 +32,12 @@ - */ - - #include <_ansi.h> -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - #define LBLOCKSIZE (sizeof (long)) --#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1)) -+#define UNALIGNED(X) ((intptr_t)X & (LBLOCKSIZE - 1)) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c newlib-1.19.0/newlib/libc/string/strncasecmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strncasecmp.c 2009-04-23 20:11:22.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strncasecmp.c 2011-04-22 23:54:49.823327958 +0200 -@@ -6,11 +6,11 @@ - strncasecmp - - ANSI_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strncasecmp(const char *<[a]>, const char * <[b]>, size_t <[length]>); - - TRAD_SYNOPSIS -- #include <string.h> -+ #include <strings.h> - int strncasecmp(<[a]>, <[b]>, <[length]>) - char *<[a]>; - char *<[b]>; -@@ -40,7 +40,7 @@ - strncasecmp - */ - --#include <string.h> -+#include <strings.h> - #include <ctype.h> - - int -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncat.c newlib-1.19.0/newlib/libc/string/strncat.c ---- newlib-1.19.0.orig/newlib/libc/string/strncat.c 2005-10-28 23:21:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/string/strncat.c 2011-04-22 23:54:49.825327883 +0200 -@@ -42,11 +42,12 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /* Nonzero if X is aligned on a "long" boundary. */ - #define ALIGNED(X) \ -- (((long)X & (sizeof (long) - 1)) == 0) -+ (((intptr_t)X & (sizeof (long) - 1)) == 0) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncmp.c newlib-1.19.0/newlib/libc/string/strncmp.c ---- newlib-1.19.0.orig/newlib/libc/string/strncmp.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strncmp.c 2011-04-22 23:54:49.826327845 +0200 -@@ -36,12 +36,13 @@ - strncmp ansi pure - */ - -+#include <stdint.h> - #include <string.h> - #include <limits.h> - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((uintptr_t)X & (sizeof (long) - 1)) | ((uintptr_t)Y & (sizeof (long) - 1))) - - /* DETECTNULL returns nonzero if (long)X contains a NULL byte. */ - #if LONG_MAX == 2147483647L -diff -Naur newlib-1.19.0.orig/newlib/libc/string/strncpy.c newlib-1.19.0/newlib/libc/string/strncpy.c ---- newlib-1.19.0.orig/newlib/libc/string/strncpy.c 2000-02-17 20:39:48.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/strncpy.c 2011-04-22 23:54:49.828327770 +0200 -@@ -38,6 +38,7 @@ - */ - - #include <string.h> -+#include <stdint.h> - #include <limits.h> - - /*SUPPRESS 560*/ -@@ -45,7 +46,7 @@ - - /* Nonzero if either X or Y is not aligned on a "long" boundary. */ - #define UNALIGNED(X, Y) \ -- (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1))) -+ (((intptr_t)X & (sizeof (long) - 1)) | ((intptr_t)Y & (sizeof (long) - 1))) - - #if LONG_MAX == 2147483647L - #define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080) -diff -Naur newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c ---- newlib-1.19.0.orig/newlib/libc/string/xpg_strerror_r.c 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/string/xpg_strerror_r.c 2011-04-22 23:54:49.829327733 +0200 -@@ -0,0 +1,25 @@ -+/* POSIX variant of strerror_r. */ -+#undef __STRICT_ANSI__ -+#include <errno.h> -+#include <string.h> -+ -+int -+_DEFUN (__xpg_strerror_r, (errnum, buffer, n), -+ int errnum _AND -+ char *buffer _AND -+ size_t n) -+{ -+ char *error; -+ -+ if (!n) -+ return ERANGE; -+ error = strerror (errnum); -+ if (strlen (error) >= n) -+ { -+ memcpy (buffer, error, n - 1); -+ buffer[n - 1] = '\0'; -+ return ERANGE; -+ } -+ strcpy (buffer, error); -+ return *error ? 0 : EINVAL; -+} -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h ---- newlib-1.19.0.orig/newlib/libc/sys/linux/sys/signal.h 2002-07-24 20:18:07.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/sys/linux/sys/signal.h 2011-04-22 23:54:49.830327696 +0200 -@@ -50,7 +50,6 @@ - - #ifndef _POSIX_SOURCE - extern const char *const sys_siglist[]; --typedef __sighandler_t sig_t; /* BSDism */ - #endif - - #endif -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.19.0/newlib/libc/sys/rtems/crt0.c ---- newlib-1.19.0.orig/newlib/libc/sys/rtems/crt0.c 2009-12-16 19:28:14.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/sys/rtems/crt0.c 2011-04-22 23:54:49.832327621 +0200 -@@ -24,8 +24,8 @@ - /* RTEMS provides some of its own routines including a Malloc family */ - RTEMS_STUB(void *,malloc(size_t s)) { return 0; } - RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; } --RTEMS_STUB(void, free(void)) { ; } --RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {} -+RTEMS_STUB(void, free(void* ptr)) { ; } -+RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2)) {} - - #if defined(__GNUC__) - /* -@@ -49,6 +49,7 @@ - #endif - - /* stubs for functions RTEMS provides */ -+RTEMS_STUB(int, clock_gettime(clockid_t clk_id, struct timespec *tp)) { return -1; } - RTEMS_STUB(int, close (int fd)) { return -1; } - RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; } - RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; } -@@ -56,6 +57,7 @@ - RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; } - RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; } - RTEMS_STUB(char *, getlogin(void)) { return 0; } -+RTEMS_STUB(int, gettimeofday(struct timeval *tv, struct timezone *tz)) { return -1; } - RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; } - RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; } - RTEMS_STUB(uid_t, getuid(void)) { return 0; } -@@ -65,6 +67,7 @@ - RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; } - RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; } - RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; } -+RTEMS_STUB(int, sched_yield(void)) { return -1; } - RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; } - RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; } - RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; } -@@ -95,7 +98,7 @@ - RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; } - #if !defined(REENTRANT_SYSCALLS_PROVIDED) - /* cf. newlib/libc/reent/linkr.c */ --RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; } -+RTEMS_STUB(int, _link_r (struct _reent *r, const char *oldpath, const char *newpath)) { return -1; } - #endif - RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; } - RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; } -@@ -103,14 +106,14 @@ - RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; } - #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED)) - /* cf. newlib/libc/reent/sbrkr.c */ --RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; } -+RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t addr)) { return 0; } - #endif - RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; } - RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; } - RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; } - #if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC)) - /* cf. newlib/libc/reent/execr.c */ --RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; } -+RTEMS_STUB(int, _wait_r (struct _reent *r, int *status)) { return -1; } - #endif - RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; } - -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h ---- newlib-1.19.0.orig/newlib/libc/sys/rtems/include/limits.h 2008-11-17 23:05:12.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/sys/rtems/include/limits.h 2011-04-22 23:54:49.832327621 +0200 -@@ -78,7 +78,13 @@ - * Invariant values - */ - -+#ifdef __SIZE_MAX__ -+#define SSIZE_MAX (__SIZE_MAX__ >> 1) -+#elif defined(__SIZEOF_SIZE_T__) && defined(__CHAR_BIT__) -+#define SSIZE_MAX ((1UL << (__SIZEOF_SIZE_T__ * __CHAR_BIT__ - 1)) - 1) -+#else /* historic fallback, wrong in most cases */ - #define SSIZE_MAX 32767 -+#endif - - /* - * Maximum Values -diff -Naur newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h ---- newlib-1.19.0.orig/newlib/libc/sys/rtems/sys/dirent.h 2010-07-06 17:23:27.000000000 +0200 -+++ newlib-1.19.0/newlib/libc/sys/rtems/sys/dirent.h 2011-04-22 23:54:49.833327583 +0200 -@@ -50,7 +50,7 @@ - - int scandir ( const char *dirname, - struct dirent *** namelist, -- int (*select)(struct dirent *), -+ int (*select)(const struct dirent *), - int (*dcomp)(const struct dirent **, const struct dirent **) - ); - -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr.c newlib-1.19.0/newlib/libc/xdr/xdr.c ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr.c 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr.c 2011-04-22 23:54:49.835327508 +0200 -@@ -113,7 +113,7 @@ - #elif INT_MAX == LONG_MAX - return xdr_long (xdrs, (long *) ip); - #else --# error Unexpeced integer sizes in xdr_int() -+# error Unexpected integer sizes in xdr_int() - #endif - } - -@@ -148,7 +148,7 @@ - #elif UINT_MAX == ULONG_MAX - return xdr_u_long (xdrs, (u_long *) up); - #else --# error Unexpeced integer sizes in xdr_int() -+# error Unexpected integer sizes in xdr_int() - #endif - } - -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h newlib-1.19.0/newlib/libc/xdr/xdr_private.h ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_private.h 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr_private.h 2011-04-22 23:54:49.836327471 +0200 -@@ -25,6 +25,7 @@ - - #include <_ansi.h> - #include <stdarg.h> -+#include <stdint.h> - #include <sys/param.h> - - /* avoid including stdio header here */ -diff -Naur newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c newlib-1.19.0/newlib/libc/xdr/xdr_rec.c ---- newlib-1.19.0.orig/newlib/libc/xdr/xdr_rec.c 2010-03-02 13:05:18.000000000 +0100 -+++ newlib-1.19.0/newlib/libc/xdr/xdr_rec.c 2011-04-22 23:54:49.837327434 +0200 -@@ -51,6 +51,7 @@ - #include <assert.h> - #include <unistd.h> - #include <errno.h> -+#include <limits.h> - - #include <rpc/types.h> - #include <rpc/xdr.h> -diff -Naur newlib-1.19.0.orig/newlib/libm/common/modfl.c newlib-1.19.0/newlib/libm/common/modfl.c ---- newlib-1.19.0.orig/newlib/libm/common/modfl.c 2009-04-18 00:15:43.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/common/modfl.c 2011-04-22 23:54:49.838327397 +0200 -@@ -36,7 +36,7 @@ - long double - modfl (long double x, long double *iptr) - { -- return modf(x, iptr); -+ return modf(x, (double*) iptr); - } - #endif - -diff -Naur newlib-1.19.0.orig/newlib/libm/common/s_round.c newlib-1.19.0/newlib/libm/common/s_round.c ---- newlib-1.19.0.orig/newlib/libm/common/s_round.c 2009-03-25 20:13:01.000000000 +0100 -+++ newlib-1.19.0/newlib/libm/common/s_round.c 2011-04-22 23:54:49.839327360 +0200 -@@ -68,7 +68,7 @@ - msw &= 0x80000000; - if (exponent_less_1023 == -1) - /* Result is +1.0 or -1.0. */ -- msw |= (1023 << 20); -+ msw |= ((__int32_t)1023 << 20); - lsw = 0; - } - else -diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cproj.c newlib-1.19.0/newlib/libm/complex/cproj.c ---- newlib-1.19.0.orig/newlib/libm/complex/cproj.c 2010-10-19 00:40:24.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/complex/cproj.c 2011-04-22 23:54:49.840327323 +0200 -@@ -93,7 +93,7 @@ - { - double_complex w = { .z = z }; - -- if (isinf(creal(z) || isinf(cimag(z)))) { -+ if (isinf(creal(z)) || isinf(cimag(z))) { - #ifdef __INFINITY - REAL_PART(w) = __INFINITY; - #else -diff -Naur newlib-1.19.0.orig/newlib/libm/complex/cprojf.c newlib-1.19.0/newlib/libm/complex/cprojf.c ---- newlib-1.19.0.orig/newlib/libm/complex/cprojf.c 2010-10-08 12:35:14.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/complex/cprojf.c 2011-04-22 23:54:49.841327285 +0200 -@@ -55,7 +55,7 @@ - { - float_complex w = { .z = z }; - -- if (isinf(crealf(z) || isinf(cimagf(z)))) { -+ if (isinf(crealf(z)) || isinf(cimagf(z))) { - #ifdef __INFINITY - REAL_PART(w) = __INFINITY; - #else -diff -Naur newlib-1.19.0.orig/newlib/libm/math/e_scalb.c newlib-1.19.0/newlib/libm/math/e_scalb.c ---- newlib-1.19.0.orig/newlib/libm/math/e_scalb.c 2000-02-17 20:39:51.000000000 +0100 -+++ newlib-1.19.0/newlib/libm/math/e_scalb.c 2011-04-22 23:54:49.842327247 +0200 -@@ -17,6 +17,7 @@ - * should use scalbn() instead. - */ - -+#include <limits.h> - #include "fdlibm.h" - - #ifndef _DOUBLE_IS_32BITS -@@ -46,8 +47,17 @@ - else return x/(-fn); - } - if (rint(fn)!=fn) return (fn-fn)/(fn-fn); -+#if (INT_MAX < 65000) -+ if ( fn > (double) INT_MAX) return scalbn(x, INT_MAX); -+#else - if ( fn > 65000.0) return scalbn(x, 65000); -- if (-fn > 65000.0) return scalbn(x,-65000); -+#endif -+ -+#if (INT_MIN > -65000) -+ if (fn < (double) INT_MIN) return scalbn(x,INT_MIN); -+#else -+ if (fn < -65000.0) return scalbn(x,-65000); -+#endif - return scalbn(x,(int)fn); - #endif - } -diff -Naur newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c newlib-1.19.0/newlib/libm/math/wf_tgamma.c ---- newlib-1.19.0.orig/newlib/libm/math/wf_tgamma.c 2007-09-04 19:33:10.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/math/wf_tgamma.c 2011-04-22 23:54:49.843327209 +0200 -@@ -43,3 +43,17 @@ - return y; - #endif - } -+ -+#ifdef _DOUBLE_IS_32BITS -+ -+#ifdef __STDC__ -+ double tgamma(double x) -+#else -+ double tgamma(x) -+ double x; -+#endif -+{ -+ return (double) tgammaf((float) x); -+} -+ -+#endif /* defined(_DOUBLE_IS_32BITS) */ -diff -Naur newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c newlib-1.19.0/newlib/libm/math/w_tgamma.c ---- newlib-1.19.0.orig/newlib/libm/math/w_tgamma.c 2002-06-07 23:59:56.000000000 +0200 -+++ newlib-1.19.0/newlib/libm/math/w_tgamma.c 2011-04-22 23:54:49.843327209 +0200 -@@ -17,6 +17,8 @@ - - #include "fdlibm.h" - -+#ifndef _DOUBLE_IS_32BITS -+ - #ifdef __STDC__ - double tgamma(double x) - #else -@@ -42,3 +44,5 @@ - return y; - #endif - } -+ -+#endif /* defined(_DOUBLE_IS_32BITS) */ -diff -Naur newlib-1.19.0.orig/newlib/MAINTAINERS newlib-1.19.0/newlib/MAINTAINERS ---- newlib-1.19.0.orig/newlib/MAINTAINERS 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/MAINTAINERS 2011-04-22 23:54:49.683333189 +0200 -@@ -6,7 +6,7 @@ - The official maintainers of newlib: - - Jeff Johnston jjohnstn@redhat.com --Corinna Vinschen corinna@vinchen.de -+Corinna Vinschen corinna@vinschen.de - - - Various Domain Maintainers -diff -Naur newlib-1.19.0.orig/newlib/Makefile.am newlib-1.19.0/newlib/Makefile.am ---- newlib-1.19.0.orig/newlib/Makefile.am 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/Makefile.am 2011-04-22 23:54:49.684333152 +0200 -@@ -81,7 +81,7 @@ - libc.a - endif - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - - toollib_DATA = $(CRT0) $(CRT1) - -@@ -255,7 +255,7 @@ - done - touch $@ - --CLEANFILES = targ-include stmp-targ-include -+CLEANFILES = stmp-targ-include - - install-data-local: install-toollibLIBRARIES - if USE_LIBTOOL -@@ -279,10 +279,6 @@ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ - else true; fi ; \ - done; \ -- $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \ -- for i in $(srcdir)/libc/include/rpc/*.h; do \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \ -- done; \ - $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ - for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ -@@ -430,3 +426,6 @@ - else \ - echo "WARNING: could not find \`runtest'" 1>&2 ; \ - fi -+ -+clean-local: -+ -rm -rf targ-include -diff -Naur newlib-1.19.0.orig/newlib/Makefile.in newlib-1.19.0/newlib/Makefile.in ---- newlib-1.19.0.orig/newlib/Makefile.in 2010-12-16 22:58:38.000000000 +0100 -+++ newlib-1.19.0/newlib/Makefile.in 2011-04-22 23:54:49.686333078 +0200 -@@ -122,7 +122,7 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --DATA = $(noinst_DATA) $(toollib_DATA) -+DATA = $(toollib_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -351,7 +351,7 @@ - @USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \ - @USE_LIBTOOL_FALSE@ libc.a - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - toollib_DATA = $(CRT0) $(CRT1) - - # The functions ldexp, frexp and modf are traditionally supplied in -@@ -405,13 +405,13 @@ - @USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES = libm-libtool-objectlist - @USE_LIBTOOL_TRUE@libc_la_SOURCES = - @USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = libc-libtool-objectlist --CLEANFILES = targ-include stmp-targ-include -+CLEANFILES = stmp-targ-include - CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host - MAKEOVERRIDES = - - # dejagnu support - RUNTESTFLAGS = --all: newlib.h -+all: $(BUILT_SOURCES) newlib.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: -@@ -725,14 +725,16 @@ - done - check-am: - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU --check: check-recursive -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-recursive - all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done --install: install-recursive -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive -@@ -758,10 +760,11 @@ - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - clean: clean-recursive - --clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \ -- clean-toollibLTLIBRARIES mostlyclean-am -+clean-am: clean-generic clean-libtool clean-local \ -+ clean-toollibLIBRARIES clean-toollibLTLIBRARIES mostlyclean-am - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -@@ -833,12 +836,13 @@ - uninstall-am: uninstall-toollibDATA uninstall-toollibLIBRARIES \ - uninstall-toollibLTLIBRARIES - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ -- ctags-recursive install-am install-strip tags-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ -+ check-am ctags-recursive install install-am install-strip \ -+ tags-recursive - - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-DEJAGNU check-am clean \ -- clean-generic clean-libtool clean-toollibLIBRARIES \ -+ clean-generic clean-libtool clean-local clean-toollibLIBRARIES \ - clean-toollibLTLIBRARIES ctags ctags-recursive distclean \ - distclean-DEJAGNU distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \ -@@ -985,10 +989,6 @@ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ - else true; fi ; \ - done; \ -- $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \ -- for i in $(srcdir)/libc/include/rpc/*.h; do \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \ -- done; \ - $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ - for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ -@@ -1129,6 +1129,9 @@ - echo "WARNING: could not find \`runtest'" 1>&2 ; \ - fi - -+clean-local: -+ -rm -rf targ-include -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: |