diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 8 | ||||
| -rwxr-xr-x | sysdeps/mach/hurd/configure | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure.in | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/getdents.c | 38 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/vdprintf.c | 30 |
5 files changed, 44 insertions, 38 deletions
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index b68d53879d..618ad1d3e4 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -98,9 +98,9 @@ common-generated += errnos.d stamp-errnos libc-name = crt ifeq (,$(subdir)) -install-others += $(libdir)/libc.a $(libdir)/libc_p.a -$(libdir)/libc.a: $(hurd)/libc-ldscript; $(do-install) -$(libdir)/libc_p.a: $(hurd)/libc_p-ldscript; $(do-install) +install-others += $(inst_libdir)/libc.a $(inst_libdir)/libc_p.a +$(inst_libdir)/libc.a: $(hurd)/libc-ldscript; $(do-install) +$(inst_libdir)/libc_p.a: $(hurd)/libc_p-ldscript; $(do-install) endif # Make sure these are used to build the libc.so shared object too. @@ -110,7 +110,7 @@ $(common-objpfx)libc.so: $(rpcuserlibs) rpath-link := $(rpath-link):$(common-objpfx)mach:$(common-objpfx)hurd # And get them into the libc.so ldscript. -$(libdir)/libc.so: $(rpcuserlibs) +$(inst_libdir)/libc.so: $(rpcuserlibs) # The RPC stubs from these libraries are needed in building the dynamic # linker, too. It must be self-contained, so we link the needed PIC diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure index ab0a8021d0..99497b81df 100755 --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -1,4 +1,7 @@ +# GNU libc on the Hurd is always reentrant. +DEFINES="$DEFINES -D_LIBC_REENTRANT" + # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes diff --git a/sysdeps/mach/hurd/configure.in b/sysdeps/mach/hurd/configure.in index d9ebba5f4b..29bb7e07b9 100644 --- a/sysdeps/mach/hurd/configure.in +++ b/sysdeps/mach/hurd/configure.in @@ -1,6 +1,9 @@ sinclude(./aclocal.m4)dnl Autoconf lossage. GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# GNU libc on the Hurd is always reentrant. +DEFINES="$DEFINES -D_LIBC_REENTRANT" + # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes diff --git a/sysdeps/mach/hurd/getdents.c b/sysdeps/mach/hurd/getdents.c index 4de2eb351d..61b11accd1 100644 --- a/sysdeps/mach/hurd/getdents.c +++ b/sysdeps/mach/hurd/getdents.c @@ -1,23 +1,21 @@ -/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Ince +/* Copyright (C) 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. -This file is part of the GNU C Library. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include <ansidecl.h> #include <stddef.h> #include <errno.h> #include <sys/types.h> @@ -26,8 +24,11 @@ Cambridge, MA 02139, USA. */ #include <string.h> ssize_t -DEFUN(__getdirentries, (fd, buf, nbytes, basep), - int fd AND PTR buf AND size_t nbytes AND off_t *basep) +__getdirentries (fd, buf, nbytes, basep) + int fd; + char *buf; + size_t nbytes; + off_t *basep; { error_t err; int entriesread; @@ -59,4 +60,3 @@ DEFUN(__getdirentries, (fd, buf, nbytes, basep), } weak_alias (__getdirentries, getdirentries) - diff --git a/sysdeps/mach/hurd/vdprintf.c b/sysdeps/mach/hurd/vdprintf.c index 415258c6b6..e14c295f3e 100644 --- a/sysdeps/mach/hurd/vdprintf.c +++ b/sysdeps/mach/hurd/vdprintf.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1992, 1993, 1997 Free Software Foundation, Inc. -This file is part of the GNU C Library. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <limits.h> @@ -33,14 +33,14 @@ vdprintf (int d, const char *format, va_list arg) struct hurd_fd *fd; HURD_CRITICAL_BEGIN; - fd = _hurd_fd_get (d); + fd = _hurd_fd_get (fd); HURD_CRITICAL_END; if (!fd) return 0; /* Create an unbuffered stream talking to D on the stack. */ - memset ((void *) &f, 0, sizeof(f)); + memset ((void *) &f, 0, sizeof (f)); f.__magic = _IOMAGIC; f.__mode.__write = 1; f.__cookie = fd; |