From 3d7a2727b74acea63242527654b7392d2efec291 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Mon, 16 Apr 2007 19:47:20 +0000 Subject: [PATCH] fix libgloss patches for REENTRANT_SYSCALLS_PROVIDED --- dkarm-eabi/patches/newlib-1.15.0.patch | 138 ++++++++++++++----------- 1 file changed, 79 insertions(+), 59 deletions(-) diff --git a/dkarm-eabi/patches/newlib-1.15.0.patch b/dkarm-eabi/patches/newlib-1.15.0.patch index 5541195..b962bd5 100644 --- a/dkarm-eabi/patches/newlib-1.15.0.patch +++ b/dkarm-eabi/patches/newlib-1.15.0.patch @@ -1,6 +1,6 @@ diff -Nbaur newlib-1.15.0/libgloss/configure newlib-1.15.0-new/libgloss/configure --- newlib-1.15.0/libgloss/configure Mon Dec 18 21:48:18 2006 -+++ newlib-1.15.0-new/libgloss/configure Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/configure Fri Feb 16 09:13:44 2007 @@ -272,8 +272,10 @@ PACKAGE_BUGREPORT='' @@ -33,7 +33,7 @@ diff -Nbaur newlib-1.15.0/libgloss/configure newlib-1.15.0-new/libgloss/configur case "${target}" in diff -Nbaur newlib-1.15.0/libgloss/configure.in newlib-1.15.0-new/libgloss/configure.in --- newlib-1.15.0/libgloss/configure.in Mon Dec 18 21:48:18 2006 -+++ newlib-1.15.0-new/libgloss/configure.in Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/configure.in Fri Feb 16 09:13:44 2007 @@ -2,6 +2,7 @@ AC_PREREQ(2.59) AC_INIT([libgloss],[LIBGLOSS_VERSION]) @@ -52,7 +52,7 @@ diff -Nbaur newlib-1.15.0/libgloss/configure.in newlib-1.15.0-new/libgloss/confi i[[3456]]86-*-elf* | i[[3456]]86-*-coff*) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/Makefile.in newlib-1.15.0-new/libgloss/libsysbase/Makefile.in --- newlib-1.15.0/libgloss/libsysbase/Makefile.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/Makefile.in Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/Makefile.in Fri Feb 16 09:13:45 2007 @@ -0,0 +1,146 @@ +# Copyright (c) 1998 Cygnus Support +# @@ -202,7 +202,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/Makefile.in newlib-1.15.0-new/libg + $(SHELL) config.status --recheck diff -Nbaur newlib-1.15.0/libgloss/libsysbase/_exit.c newlib-1.15.0-new/libgloss/libsysbase/_exit.c --- newlib-1.15.0/libgloss/libsysbase/_exit.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/_exit.c Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/_exit.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,14 @@ +/* Stub version of _exit. */ + @@ -220,19 +220,19 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/_exit.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/abort.c newlib-1.15.0-new/libgloss/libsysbase/abort.c --- newlib-1.15.0/libgloss/libsysbase/abort.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/abort.c Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/abort.c Fri Apr 13 02:04:39 2007 @@ -0,0 +1,8 @@ +#include +#include + +void abort(void) { + write (2, "Abort called.\n", sizeof("Abort called.\n")-1); -+ exit (1); ++ _exit (1); +} + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/acconfig.h newlib-1.15.0-new/libgloss/libsysbase/acconfig.h --- newlib-1.15.0/libgloss/libsysbase/acconfig.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/acconfig.h Mon Feb 12 09:22:37 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/acconfig.h Fri Feb 16 09:13:45 2007 @@ -0,0 +1,26 @@ +/* Name of package. */ +#undef PACKAGE @@ -262,7 +262,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/acconfig.h newlib-1.15.0-new/libgl +#undef __SYMBOL_PREFIX diff -Nbaur newlib-1.15.0/libgloss/libsysbase/aclocal.m4 newlib-1.15.0-new/libgloss/libsysbase/aclocal.m4 --- newlib-1.15.0/libgloss/libsysbase/aclocal.m4 Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/aclocal.m4 Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/aclocal.m4 Fri Feb 16 09:13:45 2007 @@ -0,0 +1,344 @@ +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- + @@ -610,7 +610,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/aclocal.m4 newlib-1.15.0-new/libgl +m4_include([../acinclude.m4]) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/chdir.c newlib-1.15.0-new/libgloss/libsysbase/chdir.c --- newlib-1.15.0/libgloss/libsysbase/chdir.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/chdir.c Mon Feb 12 09:45:36 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/chdir.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,175 @@ +#include +#include @@ -789,7 +789,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/chdir.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/close.c newlib-1.15.0-new/libgloss/libsysbase/close.c --- newlib-1.15.0/libgloss/libsysbase/close.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/close.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/close.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,38 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -831,7 +831,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/close.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/config.h.in newlib-1.15.0-new/libgloss/libsysbase/config.h.in --- newlib-1.15.0/libgloss/libsysbase/config.h.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/config.h.in Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/config.h.in Fri Feb 16 09:13:45 2007 @@ -0,0 +1,22 @@ +/* config.h.in. Generated automatically from configure.in by autoheader. */ + @@ -857,7 +857,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/config.h.in newlib-1.15.0-new/libg +#undef __SYMBOL_PREFIX diff -Nbaur newlib-1.15.0/libgloss/libsysbase/configure newlib-1.15.0-new/libgloss/libsysbase/configure --- newlib-1.15.0/libgloss/libsysbase/configure Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/configure Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/configure Fri Feb 16 09:13:45 2007 @@ -0,0 +1,3543 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -4404,7 +4404,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/configure newlib-1.15.0-new/libglo + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/configure.in newlib-1.15.0-new/libgloss/libsysbase/configure.in --- newlib-1.15.0/libgloss/libsysbase/configure.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/configure.in Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/configure.in Fri Feb 16 09:13:45 2007 @@ -0,0 +1,204 @@ +# Copyright (c) 1995, 1996 Cygnus Support +# @@ -4612,7 +4612,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/configure.in newlib-1.15.0-new/lib + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/dir.c newlib-1.15.0-new/libgloss/libsysbase/dir.c --- newlib-1.15.0/libgloss/libsysbase/dir.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/dir.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/dir.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,94 @@ +#include +#include @@ -4710,7 +4710,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/dir.c newlib-1.15.0-new/libgloss/l + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/environ.c newlib-1.15.0-new/libgloss/libsysbase/environ.c --- newlib-1.15.0/libgloss/libsysbase/environ.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/environ.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/environ.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,6 @@ +/* + * Version of environ for no OS. @@ -4720,7 +4720,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/environ.c newlib-1.15.0-new/libglo +char **environ = __env; diff -Nbaur newlib-1.15.0/libgloss/libsysbase/execve.c newlib-1.15.0-new/libgloss/libsysbase/execve.c --- newlib-1.15.0/libgloss/libsysbase/execve.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/execve.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/execve.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,21 @@ +/* + * Stub version of execve. @@ -4745,7 +4745,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/execve.c newlib-1.15.0-new/libglos +stub_warning(_execve) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/fork.c newlib-1.15.0-new/libgloss/libsysbase/fork.c --- newlib-1.15.0/libgloss/libsysbase/fork.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/fork.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/fork.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,19 @@ +/* + * Stub version of fork. @@ -4768,7 +4768,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/fork.c newlib-1.15.0-new/libgloss/ +stub_warning(_fork) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/fstat.c newlib-1.15.0-new/libgloss/libsysbase/fstat.c --- newlib-1.15.0/libgloss/libsysbase/fstat.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/fstat.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/fstat.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,45 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -4817,7 +4817,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/fstat.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/getpid.c newlib-1.15.0-new/libgloss/libsysbase/getpid.c --- newlib-1.15.0/libgloss/libsysbase/getpid.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/getpid.c Mon Feb 12 09:22:38 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/getpid.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,20 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -4841,7 +4841,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/getpid.c newlib-1.15.0-new/libglos + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/gettod.c newlib-1.15.0-new/libgloss/libsysbase/gettod.c --- newlib-1.15.0/libgloss/libsysbase/gettod.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/gettod.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/gettod.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,25 @@ +/* + * Stub version of gettimeofday. @@ -4870,7 +4870,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/gettod.c newlib-1.15.0-new/libglos +stub_warning(_gettimeofday) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/iosupport.c newlib-1.15.0-new/libgloss/libsysbase/iosupport.c --- newlib-1.15.0/libgloss/libsysbase/iosupport.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/iosupport.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/iosupport.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,98 @@ +#include +#include @@ -4972,7 +4972,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/iosupport.c newlib-1.15.0-new/libg +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/isatty.c newlib-1.15.0-new/libgloss/libsysbase/isatty.c --- newlib-1.15.0/libgloss/libsysbase/isatty.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/isatty.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/isatty.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,10 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -4986,7 +4986,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/isatty.c newlib-1.15.0-new/libglos +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/kill.c newlib-1.15.0-new/libgloss/libsysbase/kill.c --- newlib-1.15.0/libgloss/libsysbase/kill.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/kill.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/kill.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,24 @@ +/* + * Stub version of kill. @@ -5014,7 +5014,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/kill.c newlib-1.15.0-new/libgloss/ +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/link.c newlib-1.15.0-new/libgloss/libsysbase/link.c --- newlib-1.15.0/libgloss/libsysbase/link.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/link.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/link.c Fri Apr 13 01:57:55 2007 @@ -0,0 +1,36 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5024,7 +5024,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/link.c newlib-1.15.0-new/libgloss/ + +#ifdef REENTRANT_SYSCALLS_PROVIDED +int _DEFUN (_link_r, (r, existing, new), -+ struct _reent r _AND ++ struct _reent *r _AND + const char *existing _AND + const char *new) { +#else @@ -5054,7 +5054,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/link.c newlib-1.15.0-new/libgloss/ + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/lseek.c newlib-1.15.0-new/libgloss/libsysbase/lseek.c --- newlib-1.15.0/libgloss/libsysbase/lseek.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/lseek.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/lseek.c Fri Apr 13 02:43:11 2007 @@ -0,0 +1,46 @@ + +#include <_ansi.h> @@ -5066,15 +5066,15 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/lseek.c newlib-1.15.0-new/libgloss +//--------------------------------------------------------------------------------- +#ifdef REENTRANT_SYSCALLS_PROVIDED +//--------------------------------------------------------------------------------- -+int _DEFUN(_lseek_r,(r, fileDesc, pos, dir), ++_off_t _DEFUN (_lseek_r, (r, fileDesc, pos, dir), + struct _reent * r _AND + int fileDesc _AND -+ int pos _AND -+ int dir) ++ _off_t pos _AND ++ int dir) { +//--------------------------------------------------------------------------------- +#else +//--------------------------------------------------------------------------------- -+int _DEFUN(_lseek,(fileDesc, pos, dir), ++int _DEFUN (_lseek,(fileDesc, pos, dir), + int fileDesc _AND + int pos _AND + int dir) { @@ -5104,13 +5104,13 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/lseek.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/malloc_vars.c newlib-1.15.0-new/libgloss/libsysbase/malloc_vars.c --- newlib-1.15.0/libgloss/libsysbase/malloc_vars.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/malloc_vars.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/malloc_vars.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,2 @@ +char *fake_heap_end = (char*)0; +char *fake_heap_start = (char*)0; diff -Nbaur newlib-1.15.0/libgloss/libsysbase/mkdir.c newlib-1.15.0-new/libgloss/libsysbase/mkdir.c --- newlib-1.15.0/libgloss/libsysbase/mkdir.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/mkdir.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/mkdir.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,18 @@ +#include +#include @@ -5132,7 +5132,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/mkdir.c newlib-1.15.0-new/libgloss +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/open.c newlib-1.15.0-new/libgloss/libsysbase/open.c --- newlib-1.15.0/libgloss/libsysbase/open.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/open.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/open.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,58 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5194,7 +5194,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/open.c newlib-1.15.0-new/libgloss/ +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/read.c newlib-1.15.0-new/libgloss/libsysbase/read.c --- newlib-1.15.0/libgloss/libsysbase/read.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/read.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/read.c Fri Apr 13 02:47:07 2007 @@ -0,0 +1,44 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5205,11 +5205,11 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/read.c newlib-1.15.0-new/libgloss/ + +#ifdef REENTRANT_SYSCALLS_PROVIDED +//--------------------------------------------------------------------------------- -+int _DEFUN(_read_r,(r, fileDesc, ptr, len), ++_ssize_t _DEFUN(_read_r,(r, fileDesc, ptr, len), + struct _reent * r _AND + int fileDesc _AND -+ char *ptr _AND -+ int len) { ++ void *ptr _AND ++ size_t len) { +//--------------------------------------------------------------------------------- +#else +//--------------------------------------------------------------------------------- @@ -5242,7 +5242,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/read.c newlib-1.15.0-new/libgloss/ + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/rename.c newlib-1.15.0-new/libgloss/libsysbase/rename.c --- newlib-1.15.0/libgloss/libsysbase/rename.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/rename.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/rename.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,25 @@ +#include +#include @@ -5271,7 +5271,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/rename.c newlib-1.15.0-new/libglos +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/sbrk.c newlib-1.15.0-new/libgloss/libsysbase/sbrk.c --- newlib-1.15.0/libgloss/libsysbase/sbrk.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/sbrk.c Mon Feb 12 09:22:39 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/sbrk.c Fri Apr 13 02:49:25 2007 @@ -0,0 +1,61 @@ +#include <_ansi.h> +#include @@ -5294,7 +5294,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/sbrk.c newlib-1.15.0-new/libgloss/ + +#ifdef REENTRANT_SYSCALLS_PROVIDED +//--------------------------------------------------------------------------------- -+caddr_t _sbrk_r (struct _reent *ptr, int incr) { ++void * _sbrk_r (struct _reent *ptr, ptrdiff_t incr) { +//--------------------------------------------------------------------------------- +#else +//--------------------------------------------------------------------------------- @@ -5336,7 +5336,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/sbrk.c newlib-1.15.0-new/libgloss/ +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/stat.c newlib-1.15.0-new/libgloss/libsysbase/stat.c --- newlib-1.15.0/libgloss/libsysbase/stat.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/stat.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/stat.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,39 @@ +#include "config.h" +#include <_ansi.h> @@ -5379,7 +5379,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/stat.c newlib-1.15.0-new/libgloss/ + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/times.c newlib-1.15.0-new/libgloss/libsysbase/times.c --- newlib-1.15.0/libgloss/libsysbase/times.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/times.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/times.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,13 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5396,7 +5396,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/times.c newlib-1.15.0-new/libgloss + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/unlink.c newlib-1.15.0-new/libgloss/libsysbase/unlink.c --- newlib-1.15.0/libgloss/libsysbase/unlink.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/unlink.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/unlink.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,32 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5432,7 +5432,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/unlink.c newlib-1.15.0-new/libglos + diff -Nbaur newlib-1.15.0/libgloss/libsysbase/wait.c newlib-1.15.0-new/libgloss/libsysbase/wait.c --- newlib-1.15.0/libgloss/libsysbase/wait.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/wait.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/wait.c Fri Feb 16 09:13:45 2007 @@ -0,0 +1,19 @@ +/* + * Stub version of wait. @@ -5455,7 +5455,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/wait.c newlib-1.15.0-new/libgloss/ +stub_warning(_wait) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/warning.h newlib-1.15.0-new/libgloss/libsysbase/warning.h --- newlib-1.15.0/libgloss/libsysbase/warning.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/warning.h Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/warning.h Fri Feb 16 09:13:45 2007 @@ -0,0 +1,43 @@ +#ifndef __WARNING_H__ +#define __WARNING_H__ @@ -5502,7 +5502,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/warning.h newlib-1.15.0-new/libglo +#endif /* __WARNING_H__ */ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/write.c newlib-1.15.0-new/libgloss/libsysbase/write.c --- newlib-1.15.0/libgloss/libsysbase/write.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/write.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/write.c Fri Apr 13 02:52:14 2007 @@ -0,0 +1,44 @@ +#include <_ansi.h> +#include <_syslist.h> @@ -5513,11 +5513,11 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/write.c newlib-1.15.0-new/libgloss + +#ifdef REENTRANT_SYSCALLS_PROVIDED +//--------------------------------------------------------------------------------- -+int _DEFUN(_write_r,(r, fileDesc, ptr, len), ++_ssize_t _DEFUN(_write_r,(r, fileDesc, ptr, len), + struct _reent * r _AND + int fileDesc _AND -+ char *ptr _AND -+ int len) { ++ void *ptr _AND ++ size_t len) { +//--------------------------------------------------------------------------------- +#else +//--------------------------------------------------------------------------------- @@ -5548,9 +5548,21 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/write.c newlib-1.15.0-new/libgloss + } + return ret; +} +diff -Nbaur newlib-1.15.0/newlib/libc/include/reent.h newlib-1.15.0-new/newlib/libc/include/reent.h +--- newlib-1.15.0/newlib/libc/include/reent.h Wed Aug 27 17:24:57 2003 ++++ newlib-1.15.0-new/newlib/libc/include/reent.h Fri Apr 13 02:55:00 2007 +@@ -77,7 +77,7 @@ + extern _CLOCK_T_ _times_r _PARAMS ((struct _reent *, struct tms *)); + extern int _unlink_r _PARAMS ((struct _reent *, const char *)); + extern int _wait_r _PARAMS ((struct _reent *, int *)); +-extern _ssize_t _write_r _PARAMS ((struct _reent *, int, const void *, size_t)); ++extern _ssize_t _write_r _PARAMS ((struct _reent *, int, void *, size_t)); + + /* This one is not guaranteed to be available on all targets. */ + extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *tp, struct timezone *tzp)); diff -Nbaur newlib-1.15.0/newlib/libc/include/stdio.h newlib-1.15.0-new/newlib/libc/include/stdio.h --- newlib-1.15.0/newlib/libc/include/stdio.h Tue Sep 26 22:22:19 2006 -+++ newlib-1.15.0-new/newlib/libc/include/stdio.h Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/include/stdio.h Fri Feb 16 09:13:45 2007 @@ -179,6 +179,7 @@ int _EXFUN(printf, (const char *, ...)); int _EXFUN(scanf, (const char *, ...)); @@ -5569,7 +5581,7 @@ diff -Nbaur newlib-1.15.0/newlib/libc/include/stdio.h newlib-1.15.0-new/newlib/l int _EXFUN(vsscanf, (const char *, const char *, __VALIST)); diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/dir.h newlib-1.15.0-new/newlib/libc/include/sys/dir.h --- newlib-1.15.0/newlib/libc/include/sys/dir.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/newlib/libc/include/sys/dir.h Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/include/sys/dir.h Fri Feb 16 09:13:45 2007 @@ -0,0 +1,32 @@ +/* + @@ -5605,13 +5617,17 @@ diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/dir.h newlib-1.15.0-new/newlib +#endif // _dir_h_ diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/iosupport.h newlib-1.15.0-new/newlib/libc/include/sys/iosupport.h --- newlib-1.15.0/newlib/libc/include/sys/iosupport.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/newlib/libc/include/sys/iosupport.h Mon Feb 12 09:22:40 2007 -@@ -0,0 +1,55 @@ ++++ newlib-1.15.0-new/newlib/libc/include/sys/iosupport.h Fri Feb 16 09:39:50 2007 +@@ -0,0 +1,63 @@ +//--------------------------------------------------------------------------------- +#ifndef __iosupp_h__ +#define __iosupp_h__ +//--------------------------------------------------------------------------------- + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ +#include +#include + @@ -5659,12 +5675,16 @@ diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/iosupport.h newlib-1.15.0-new/ +int RemoveDevice(const char* name); +void setDefaultDevice( int device ); + -+//--------------------------------------------------------------------------------- ++#ifdef __cplusplus ++} +#endif ++ ++//--------------------------------------------------------------------------------- ++#endif // __iosupp_h__ +//--------------------------------------------------------------------------------- diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/reent.h newlib-1.15.0-new/newlib/libc/include/sys/reent.h --- newlib-1.15.0/newlib/libc/include/sys/reent.h Tue Sep 26 22:22:19 2006 -+++ newlib-1.15.0-new/newlib/libc/include/sys/reent.h Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/include/sys/reent.h Fri Feb 16 09:13:45 2007 @@ -153,7 +153,7 @@ int _r; /* read space left for getc() */ int _w; /* write space left for putc() */ @@ -5694,7 +5714,7 @@ diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/reent.h newlib-1.15.0-new/newl diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/types.h newlib-1.15.0-new/newlib/libc/include/sys/types.h --- newlib-1.15.0/newlib/libc/include/sys/types.h Wed Sep 13 23:09:27 2006 -+++ newlib-1.15.0-new/newlib/libc/include/sys/types.h Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/include/sys/types.h Fri Feb 16 09:13:45 2007 @@ -130,7 +130,7 @@ defined(__sparc__) || defined(__SPU__) typedef unsigned long ino_t; @@ -5715,7 +5735,7 @@ diff -Nbaur newlib-1.15.0/newlib/libc/include/sys/types.h newlib-1.15.0-new/newl diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/Makefile.am newlib-1.15.0-new/newlib/libc/syscalls/Makefile.am --- newlib-1.15.0/newlib/libc/syscalls/Makefile.am Mon May 1 23:01:07 2006 -+++ newlib-1.15.0-new/newlib/libc/syscalls/Makefile.am Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/syscalls/Makefile.am Fri Feb 16 09:13:45 2007 @@ -21,7 +21,6 @@ sysunlink.c \ syswrite.c @@ -5726,7 +5746,7 @@ diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/Makefile.am newlib-1.15.0-new/new ELIX_SOURCES = diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/syslink.c newlib-1.15.0-new/newlib/libc/syscalls/syslink.c --- newlib-1.15.0/newlib/libc/syscalls/syslink.c Tue Jun 3 20:48:08 2003 -+++ newlib-1.15.0-new/newlib/libc/syscalls/syslink.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/syscalls/syslink.c Fri Feb 16 09:13:45 2007 @@ -4,8 +4,8 @@ int @@ -5740,7 +5760,7 @@ diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/syslink.c newlib-1.15.0-new/newli return _link_r (_REENT, old, new); diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/sysunlink.c newlib-1.15.0-new/newlib/libc/syscalls/sysunlink.c --- newlib-1.15.0/newlib/libc/syscalls/sysunlink.c Tue Jun 3 20:48:08 2003 -+++ newlib-1.15.0-new/newlib/libc/syscalls/sysunlink.c Mon Feb 12 09:22:40 2007 ++++ newlib-1.15.0-new/newlib/libc/syscalls/sysunlink.c Fri Feb 16 09:13:45 2007 @@ -4,7 +4,7 @@ int