aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/alpha/fpu/fpu_control.h6
-rw-r--r--sysdeps/generic/bits/libc-lock.h4
-rw-r--r--sysdeps/generic/glob.c20
-rw-r--r--sysdeps/generic/ptsname.c4
-rw-r--r--sysdeps/generic/sys/sysinfo.h6
-rw-r--r--sysdeps/i386/sysdep.h10
-rw-r--r--sysdeps/posix/readv.c5
-rw-r--r--sysdeps/posix/writev.c5
-rw-r--r--sysdeps/unix/alpha/pipe.S (renamed from sysdeps/unix/sysv/linux/alpha/pipe.S)0
-rw-r--r--sysdeps/unix/arm/fork.S4
-rw-r--r--sysdeps/unix/bsd/bsd4.4/syscalls.list2
-rw-r--r--sysdeps/unix/bsd/osf/alpha/pipe.S33
-rw-r--r--sysdeps/unix/common/syscalls.list1
-rw-r--r--sysdeps/unix/fork.S4
-rw-r--r--sysdeps/unix/grantpt.c16
-rw-r--r--sysdeps/unix/i386/brk.S9
-rw-r--r--sysdeps/unix/i386/fork.S3
-rw-r--r--sysdeps/unix/i386/pipe.S3
-rw-r--r--sysdeps/unix/i386/wait.S3
-rw-r--r--sysdeps/unix/inet/syscalls.list8
-rw-r--r--sysdeps/unix/opendir.c14
-rw-r--r--sysdeps/unix/syscalls.list6
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h6
-rw-r--r--sysdeps/unix/sysv/linux/hppa/sysdep.h6
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h10
-rw-r--r--sysdeps/unix/sysv/linux/init-first.c3
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h6
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h12
-rw-r--r--sysdeps/unix/sysv/linux/sh/sysdep.h9
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sysdep.h6
30 files changed, 105 insertions, 119 deletions
diff --git a/sysdeps/alpha/fpu/fpu_control.h b/sysdeps/alpha/fpu/fpu_control.h
index f2214cb3ae..28acdf1704 100644
--- a/sysdeps/alpha/fpu/fpu_control.h
+++ b/sysdeps/alpha/fpu/fpu_control.h
@@ -1,5 +1,5 @@
-/* FPU control word bits. Alpha-maped-to-Intel version.
- Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
+/* FPU control word bits. Alpha-mapped-to-Intel version.
+ Copyright (C) 1996, 1998, 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Olaf Flebbe.
@@ -65,7 +65,7 @@
#define _FPU_MASK_UM 0x10
#define _FPU_MASK_PM 0x20
-/* precision control */
+/* precision control -- without effect on Alpha */
#define _FPU_EXTENDED 0x300 /* RECOMMENDED */
#define _FPU_DOUBLE 0x200
#define _FPU_SINGLE 0x0 /* DO NOT USE */
diff --git a/sysdeps/generic/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h
index 700ebd6062..ff808904a8 100644
--- a/sysdeps/generic/bits/libc-lock.h
+++ b/sysdeps/generic/bits/libc-lock.h
@@ -1,5 +1,5 @@
/* libc-internal interface for mutex locks. Stub version.
- Copyright (C) 1996,97,99,2000,01 Free Software Foundation, Inc.
+ Copyright (C) 1996,97,99,2000,01,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -123,7 +123,7 @@ typedef int __libc_key_t;
#define __libc_key_create(KEY,DEST) -1
/* Set thread-specific data associated with KEY to VAL. */
-#define __libc_setspecific(KEY,VAL) -1
+#define __libc_setspecific(KEY,VAL) ((void)0)
/* Get thread-specific data associated with KEY. */
#define __libc_getspecific(KEY) 0
diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c
index ce9c3d806f..5e56629082 100644
--- a/sysdeps/generic/glob.c
+++ b/sysdeps/generic/glob.c
@@ -191,6 +191,14 @@ extern void abort (), exit ();
#endif /* Standard headers. */
+/* NAME_MAX is usually defined in <dirent.h> or <limits.h>. */
+#if defined HAVE_LIMITS_H || defined __GNU_LIBRARY__
+# include <limits.h>
+#endif
+#ifndef NAME_MAX
+# define NAME_MAX (sizeof (((struct dirent *) 0)->d_name))
+#endif
+
#ifndef ANSI_STRING
# ifndef bzero
@@ -1330,15 +1338,21 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
size_t len;
#if defined HAVE_DIRENT64 && !defined COMPILE_GLOB64
struct dirent64 *d;
- struct dirent64 d64;
+ union
+ {
+ struct dirent64 d64;
+ char room [offsetof (struct dirent64, d_name[0])
+ + NAME_MAX + 1];
+ }
+ d64buf;
if (flags & GLOB_ALTDIRFUNC)
{
struct dirent *d32 = (*pglob->gl_readdir) (stream);
if (d32 != NULL)
{
- CONVERT_DIRENT_DIRENT64 (&d64, d32);
- d = &d64;
+ CONVERT_DIRENT_DIRENT64 (&d64buf.d64, d32);
+ d = &d64buf.d64;
}
else
d = NULL;
diff --git a/sysdeps/generic/ptsname.c b/sysdeps/generic/ptsname.c
index 2f985c7d59..c16e056a97 100644
--- a/sysdeps/generic/ptsname.c
+++ b/sysdeps/generic/ptsname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
@@ -39,7 +39,7 @@ __ptsname_r (fd, buf, len)
size_t len __attribute__ ((unused));
{
__set_errno (ENOSYS);
- return 0;
+ return ENOSYS;
}
weak_alias (__ptsname_r, ptsname_r)
diff --git a/sysdeps/generic/sys/sysinfo.h b/sysdeps/generic/sys/sysinfo.h
index 2c1faf189d..e3ed75c3ca 100644
--- a/sysdeps/generic/sys/sysinfo.h
+++ b/sysdeps/generic/sys/sysinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1997, 1999, 2000-2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +21,8 @@
#include <features.h>
+__BEGIN_DECLS
+
/* Return number of configured processors. */
extern int get_nprocs_conf (void) __THROW;
@@ -34,4 +36,6 @@ extern long int get_phys_pages (void) __THROW;
/* Return number of available physical pages of memory in the system. */
extern long int get_avphys_pages (void) __THROW;
+__END_DECLS
+
#endif /* sys/sysinfo.h */
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 180c0a6b3f..55f376d7c1 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -1,5 +1,5 @@
/* Assembler macros for i386.
- Copyright (C) 1991, 92, 93, 95, 96, 98 Free Software Foundation, Inc.
+ Copyright (C) 1991,92,93,95,96,98,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -97,9 +97,9 @@
#endif
#define PSEUDO(name, syscall_name, args) \
-lose: SYSCALL_PIC_SETUP \
- jmp JUMPTARGET(syscall_error) \
.globl syscall_error; \
+lose: SYSCALL_PIC_SETUP \
+ jmp JUMPTARGET(syscall_error); \
ENTRY (name) \
DO_CALL (syscall_name, args); \
jb lose
@@ -122,7 +122,11 @@ lose: SYSCALL_PIC_SETUP \
/* Local label name for asm code. */
#ifndef L
+#ifdef HAVE_ELF
+#define L(name) .L##name
+#else
#define L(name) name
#endif
+#endif
#endif /* __ASSEMBLER__ */
diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c
index 988ede5f51..bb6634529d 100644
--- a/sysdeps/posix/readv.c
+++ b/sysdeps/posix/readv.c
@@ -30,10 +30,7 @@
Operates just like `read' (see <unistd.h>) except that data are
put in VECTOR instead of a contiguous buffer. */
ssize_t
-__readv (fd, vector, count)
- int fd;
- const struct iovec *vector;
- int count;
+__readv (int fd, const struct iovec *vector, int count)
{
char *buffer;
char *buffer_start;
diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c
index dc2c806d66..7afdce3289 100644
--- a/sysdeps/posix/writev.c
+++ b/sysdeps/posix/writev.c
@@ -30,10 +30,7 @@
Operates just like `write' (see <unistd.h>) except that the data
are taken from VECTOR instead of a contiguous buffer. */
ssize_t
-__writev (fd, vector, count)
- int fd;
- const struct iovec *vector;
- int count;
+__writev (int fd, const struct iovec *vector, int count)
{
char *buffer;
register char *bp;
diff --git a/sysdeps/unix/sysv/linux/alpha/pipe.S b/sysdeps/unix/alpha/pipe.S
index 2da4d78abd..2da4d78abd 100644
--- a/sysdeps/unix/sysv/linux/alpha/pipe.S
+++ b/sysdeps/unix/alpha/pipe.S
diff --git a/sysdeps/unix/arm/fork.S b/sysdeps/unix/arm/fork.S
index a03fbe242e..deb22548e2 100644
--- a/sysdeps/unix/arm/fork.S
+++ b/sysdeps/unix/arm/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -28,6 +28,6 @@ SYSCALL__ (fork, 0)
sub r1, r1, $1
and r0, r0, r1
RETINSTR(mov, pc, r14)
-PSEUDO_END(fork)
+PSEUDO_END (__fork)
weak_alias (__fork, fork)
diff --git a/sysdeps/unix/bsd/bsd4.4/syscalls.list b/sysdeps/unix/bsd/bsd4.4/syscalls.list
index e13fa1a76d..a4d3546854 100644
--- a/sysdeps/unix/bsd/bsd4.4/syscalls.list
+++ b/sysdeps/unix/bsd/bsd4.4/syscalls.list
@@ -4,5 +4,5 @@ chflags - chflags 2 chflags
fchflags - fchflags 2 fchflags
revoke - revoke 1 revoke
setlogin - setlogin 2 setlogin
-sigaltstack - sigaltstack 2 sigaltstack
+sigaltstack - sigaltstack 2 __sigaltstack sigaltstack
wait4 - wait4 4 __wait4 wait4
diff --git a/sysdeps/unix/bsd/osf/alpha/pipe.S b/sysdeps/unix/bsd/osf/alpha/pipe.S
deleted file mode 100644
index b4eb2166e0..0000000000
--- a/sysdeps/unix/bsd/osf/alpha/pipe.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 1993, 1995, 1997, 2002 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Brendan Kehoe (brendan@zen.org).
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <sysdep.h>
-
-SYSCALL__ (pipe, 1)
- /* Plop in the two descriptors. */
- stl r0, 0(a0)
- stl r1, 4(a0)
-
- /* Go out with a clean status. */
- mov zero, r0
- ret
- .end __pipe
-
-libc_hidden_def (__pipe)
-weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/common/syscalls.list b/sysdeps/unix/common/syscalls.list
index fbe915cebd..bb475df25d 100644
--- a/sysdeps/unix/common/syscalls.list
+++ b/sysdeps/unix/common/syscalls.list
@@ -4,7 +4,6 @@ adjtime - adjtime i:pp __adjtime adjtime
fchmod - fchmod i:ii __fchmod fchmod
fchown - fchown i:iii __fchown fchown
ftruncate - ftruncate i:ii __ftruncate ftruncate
-getpgid - getpgrp i:i __getpgid getpgid
getrusage - getrusage i:ip __getrusage getrusage
gettimeofday - gettimeofday i:PP __gettimeofday gettimeofday __gettimeofday_internal
settimeofday - settimeofday i:PP __settimeofday settimeofday
diff --git a/sysdeps/unix/fork.S b/sysdeps/unix/fork.S
index b8a9fb9bbd..49bf6c4e54 100644
--- a/sysdeps/unix/fork.S
+++ b/sysdeps/unix/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -28,6 +28,6 @@ SYSCALL__ (fork, 0)
subl #1, r1
andl r1, r0
ret
-PSEUDO_END(fork)
+PSEUDO_END (__fork)
weak_alias (__fork, fork)
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index a6fa6f912b..5f27ce91e3 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -49,10 +49,18 @@ pts_name (int fd, char **pts, size_t buf_len)
if (buf_len)
{
rv = __ptsname_r (fd, buf, buf_len);
-
- if (rv != 0 || memchr (buf, '\0', buf_len))
- /* We either got an error, or we succeeded and the
- returned name fit in the buffer. */
+ if (rv != 0)
+ {
+ if (rv == ENOTTY)
+ /* ptsname_r returns with ENOTTY to indicate
+ a descriptor not referring to a pty master.
+ For this condition, grantpt must return EINVAL. */
+ errno = EINVAL;
+ break;
+ }
+
+ if (memchr (buf, '\0', buf_len))
+ /* We succeeded and the returned name fit in the buffer. */
break;
/* Try again with a longer buffer. */
diff --git a/sysdeps/unix/i386/brk.S b/sysdeps/unix/i386/brk.S
index 549db60c66..a7604d7e7a 100644
--- a/sysdeps/unix/i386/brk.S
+++ b/sysdeps/unix/i386/brk.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -36,9 +36,9 @@ SYSCALL__ (brk, 1)
movl 4(%esp), %eax
#ifdef PIC
/* Standard PIC nonsense to store into `__curbrk' through the GOT. */
- call here
-here: popl %ecx
- addl $_GLOBAL_OFFSET_TABLE_+[.-here], %ecx
+ call L(here)
+L(here): popl %ecx
+ addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ecx
movl C_SYMBOL_NAME(__curbrk@GOT)(%ecx), %ecx
movl %eax, (%ecx)
#else
@@ -46,5 +46,6 @@ here: popl %ecx
#endif
xorl %eax, %eax
ret
+PSEUDO_END (__brk)
weak_alias (__brk, brk)
diff --git a/sysdeps/unix/i386/fork.S b/sysdeps/unix/i386/fork.S
index 063c938703..6d5ed5bbbd 100644
--- a/sysdeps/unix/i386/fork.S
+++ b/sysdeps/unix/i386/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -26,5 +26,6 @@ SYSCALL__ (fork, 0)
decl r1
andl r1, r0
ret
+PSEUDO_END (__fork)
weak_alias (__fork, fork)
diff --git a/sysdeps/unix/i386/pipe.S b/sysdeps/unix/i386/pipe.S
index 154cd8a8ec..1bdadc649a 100644
--- a/sysdeps/unix/i386/pipe.S
+++ b/sysdeps/unix/i386/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1993,1995,1997,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@ SYSCALL__ (pipe, 1)
movl r1, 4(scratch)
xorl %eax, %eax
ret
+PSEUDO_END (__pipe)
libc_hidden_def (__pipe)
weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/i386/wait.S b/sysdeps/unix/i386/wait.S
index e4491f09ba..49195a229f 100644
--- a/sysdeps/unix/i386/wait.S
+++ b/sysdeps/unix/i386/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -24,5 +24,6 @@ SYSCALL__ (wait, 1)
je null
movl r1, (scratch) /* Yes; store the status there. */
null: ret
+PSEUDO_END (__wait)
weak_alias (__wait, wait)
diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list
index 2efafa4cdf..c2cfa9f4d6 100644
--- a/sysdeps/unix/inet/syscalls.list
+++ b/sysdeps/unix/inet/syscalls.list
@@ -2,11 +2,11 @@
accept - accept i:iBN __libc_accept accept
bind - bind i:ipi __bind bind
-connect - connect i:ipi __libc_connect __connect connect
+connect - connect i:ipi __libc_connect __connect __connect_internal connect
gethostid - gethostid i: gethostid
gethostname - gethostname i:bn __gethostname gethostname
-getpeername - getpeername i:ibN getpeername
-getsockname - getsockname i:ibN getsockname
+getpeername - getpeername i:ibN __getpeername getpeername
+getsockname - getsockname i:ibN __getsockname getsockname
getsockopt - getsockopt i:iiiBN getsockopt
listen - listen i:ii __listen listen
recv - recv i:ibni __libc_recv recv
@@ -19,7 +19,7 @@ sethostid - sethostid i:i sethostid
sethostname - sethostname i:pi sethostname
setsockopt - setsockopt i:iiibn setsockopt __setsockopt
shutdown - shutdown i:ii shutdown
-socket - socket i:iii socket
+socket - socket i:iii __socket socket
socketpair - socketpair i:iiif socketpair
diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c
index 9d9fcade82..dac1db5e55 100644
--- a/sysdeps/unix/opendir.c
+++ b/sysdeps/unix/opendir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1996,98,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1996,98,2000-2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -135,15 +135,13 @@ __opendir (const char *name)
goto lose;
#ifdef _STATBUF_ST_BLKSIZE
- if (__built