From a385ae75081696ea9d0299cdce50d4261a22fa35 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 6 Sep 2000 20:46:27 +0000 Subject: * Makefile.am: Fix space vs. tab problem in install-data-local. * Makefile.in: Regenerate. * libc/include/_ansi.h (_EXFUN): Define specially for __CYGWIN__. (_EXPARM): New macro for defining a function parameter. * libc/include/stdlib.h: Use _EXPARM. * libc/stdlib/mallocr.c: Don't build cfree for Cygwin. --- newlib/ChangeLog | 12 ++++++++++++ newlib/Makefile.am | 18 +++++++++--------- newlib/Makefile.in | 23 ++++++++++++----------- newlib/libc/include/_ansi.h | 6 ++++++ newlib/libc/include/stdlib.h | 2 +- newlib/libc/stdlib/mallocr.c | 2 +- 6 files changed, 41 insertions(+), 22 deletions(-) (limited to 'newlib') diff --git a/newlib/ChangeLog b/newlib/ChangeLog index e08fe9d1f..5bf1caf8a 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,15 @@ +Wed Sep 6 15:06:40 2000 Christopher Faylor + + * Makefile.am: Fix space vs. tab problem in install-data-local. + * Makefile.in: Regenerate. + +Wed Sep 6 13:49:51 2000 Christopher Faylor + + * libc/include/_ansi.h (_EXFUN): Define specially for __CYGWIN__. + (_EXPARM): New macro for defining a function parameter. + * libc/include/stdlib.h: Use _EXPARM. + * libc/stdlib/mallocr.c: Don't build cfree for Cygwin. + 2000-09-05 Manfred Hollstein * Makefile.am (install-data-local): Use optional $(DESTDIR) where diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 35175b224..a1ce30a8d 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -128,33 +128,33 @@ stmp-targ-include: config.status CLEANFILES = targ-include stmp-targ-include -install-data-local: install-toollibLIBRARIES - rm -f $(DESTDIR)$(toollibdir)/libg.a - ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a +install-data-local: install-toollibLIBRARIES + rm -f $(DESTDIR)$(toollibdir)/libg.a + ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ for i in $(srcdir)/libc/include/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ for i in $(srcdir)/libc/include/machine/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ else true; fi ; \ done; \ for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ else true; fi ; \ done ; \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ else true; fi ; \ done ; \ else true; fi diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 332c38b2e..eb0fdaaf8 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -126,7 +126,8 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" -@HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc +@HAVE_DOC_TRUE@DOCDIR = \ +@HAVE_DOC_TRUE@doc SUBDIRS = libc libm $(DOCDIR) . @@ -408,7 +409,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -561,33 +562,33 @@ stmp-targ-include: config.status done touch $@ -install-data-local: install-toollibLIBRARIES - rm -f $(DESTDIR)$(toollibdir)/libg.a - ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a +install-data-local: install-toollibLIBRARIES + rm -f $(DESTDIR)$(toollibdir)/libg.a + ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ for i in $(srcdir)/libc/include/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ for i in $(srcdir)/libc/include/machine/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ else true; fi ; \ done; \ for i in $(srcdir)/libc/include/sys/*.h; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ else true; fi ; \ done ; \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ if [ -f $$i ]; then \ - $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ else true; fi ; \ done ; \ else true; fi diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h index b4dc01105..8bebd1457 100644 --- a/newlib/libc/include/_ansi.h +++ b/newlib/libc/include/_ansi.h @@ -31,7 +31,13 @@ #define _SIGNED signed #define _DOTS , ... #define _VOID void +#ifdef __CYGWIN__ +#define _EXFUN(name, proto) __cdecl name proto +#define _EXPARM(name, proto) (* __cdecl name) proto +#else #define _EXFUN(name, proto) name proto +#define _EXPARM(name, proto) (* name) proto +#endif #define _DEFUN(name, arglist, args) name(args) #define _DEFUN_VOID(name) name(_NOARGS) #define _CAST_VOID (void) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 2d2b8b176..f2feebe30 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -56,7 +56,7 @@ _PTR _EXFUN(bsearch,(const _PTR __key, const _PTR __base, size_t __nmemb, size_t __size, - int _EXFUN((*_compar),(const _PTR, const _PTR)))); + int _EXPARM(_compar,(const _PTR, const _PTR)))); _PTR _EXFUN(calloc,(size_t __nmemb, size_t __size)); div_t _EXFUN(div,(int __numer, int __denom)); _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn))); diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c index 797e04656..c2b2fb91f 100644 --- a/newlib/libc/stdlib/mallocr.c +++ b/newlib/libc/stdlib/mallocr.c @@ -3198,7 +3198,7 @@ Void_t* cALLOc(RARG n, elem_size) RDECL size_t n; size_t elem_size; #endif /* DEFINE_CALLOC */ -#ifdef DEFINE_CFREE +#if defined(DEFINE_CFREE) && !defined(__CYGWIN__) /* -- cgit v1.2.3