diff options
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/resourcebits.h | 10 | ||||
-rw-r--r-- | sysdeps/unix/closedir.c | 9 | ||||
-rw-r--r-- | sysdeps/unix/getlogin.c | 11 | ||||
-rw-r--r-- | sysdeps/unix/opendir.c | 5 | ||||
-rw-r--r-- | sysdeps/unix/readdir.c | 3 | ||||
-rw-r--r-- | sysdeps/unix/syscalls.list | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/resourcebits.h | 63 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/resourcebits.h | 63 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 45 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/m68k/resourcebits.h (renamed from sysdeps/unix/sysv/linux/resourcebits.h) | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/resourcebits.h | 65 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sysconf.c | 37 | ||||
-rw-r--r-- | sysdeps/unix/sysv/sysv4/getdtsz.c | 2 |
13 files changed, 264 insertions, 67 deletions
diff --git a/sysdeps/unix/bsd/sun/sunos4/resourcebits.h b/sysdeps/unix/bsd/sun/sunos4/resourcebits.h index b5d3704e6c..485dec9b81 100644 --- a/sysdeps/unix/bsd/sun/sunos4/resourcebits.h +++ b/sysdeps/unix/bsd/sun/sunos4/resourcebits.h @@ -1,5 +1,5 @@ /* Bit values for resource limits. SunOS 4 version. -Copyright (C) 1994 Free Software Foundation, Inc. +Copyright (C) 1994, 1996 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 @@ -27,22 +27,30 @@ enum __rlimit_resource { /* Per-process CPU limit, in seconds. */ RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU /* Largest file that can be created, in bytes. */ RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE /* Maximum size of data segment, in bytes. */ RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA /* Maximum size of stack segment, in bytes. */ RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK /* Largest core file that can be created, in bytes. */ RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE /* Largest resident set size, in bytes. This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS /* Number of open files. */ RLIMIT_NOFILE, RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ +#defin RLIMIT_NOFILE RLIMIT_NOFILE +#defin RLIMIT_OFILE RLIMIT_OFILE RLIM_NLIMITS }; diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c index 1d4fd8eef0..5b938a8272 100644 --- a/sysdeps/unix/closedir.c +++ b/sysdeps/unix/closedir.c @@ -16,7 +16,6 @@ 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 <errno.h> #include <stddef.h> #include <stdlib.h> @@ -27,7 +26,7 @@ Cambridge, MA 02139, USA. */ /* Close the directory stream DIRP. Return 0 if successful, -1 if not. */ int -DEFUN(closedir, (dirp), DIR *dirp) +__closedir (DIR *dirp) { int fd; @@ -40,12 +39,12 @@ DEFUN(closedir, (dirp), DIR *dirp) __libc_lock_lock (dirp->lock); fd = dirp->fd; - free ((PTR) dirp->data); + free ((void *) dirp->data); __libc_lock_fini (dirp->lock); - free ((PTR) dirp); + free ((void *) dirp); return __close (fd); } - +weak_alias (__closedir, closedir) diff --git a/sysdeps/unix/getlogin.c b/sysdeps/unix/getlogin.c index 246b488f51..5a8ad96df2 100644 --- a/sysdeps/unix/getlogin.c +++ b/sysdeps/unix/getlogin.c @@ -16,7 +16,6 @@ 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 <errno.h> #include <unistd.h> #include <string.h> @@ -30,7 +29,7 @@ Cambridge, MA 02139, USA. */ The returned pointer, if not NULL, is good only until the next call. */ char * -DEFUN_VOID(getlogin) +getlogin (void) { char tty_pathname[2 + 2 * NAME_MAX]; char *real_tty_path = tty_pathname; @@ -44,7 +43,7 @@ DEFUN_VOID(getlogin) if (d < 0) return NULL; - if (ttyname_r (d, real_tty_path, sizeof (tty_pathname)) < 0) + if (__ttyname_r (d, real_tty_path, sizeof (tty_pathname)) < 0) err = errno; (void) close (d); @@ -57,9 +56,9 @@ DEFUN_VOID(getlogin) real_tty_path += 5; /* Remove "/dev/". */ - setutent_r (&utmp_data); + __setutent_r (&utmp_data); strncpy (line.ut_line, real_tty_path, sizeof line.ut_line); - if (getutline_r (&line, &ut, &utmp_data) < 0) + if (__getutline_r (&line, &ut, &utmp_data) < 0) { if (errno == ESRCH) /* The caller expects ENOENT if nothing is found. */ @@ -69,7 +68,7 @@ DEFUN_VOID(getlogin) else result = ut->ut_line; - endutent_r (&utmp_data); + __endutent_r (&utmp_data); return result; } diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index 8dca80b3ae..890d428086 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -31,7 +31,7 @@ Cambridge, MA 02139, USA. */ /* Open a directory stream on NAME. */ DIR * -opendir (const char *name) +__opendir (const char *name) { DIR *dirp; struct stat statbuf; @@ -49,7 +49,7 @@ opendir (const char *name) if (fd < 0) return NULL; - if (fcntl (fd, F_SETFD, FD_CLOEXEC) < 0) + if (__fcntl (fd, F_SETFD, FD_CLOEXEC) < 0) goto lose; if (fstat (fd, &statbuf) < 0) @@ -95,3 +95,4 @@ opendir (const char *name) return dirp; } +weak_alias (__opendir, opendir) diff --git a/sysdeps/unix/readdir.c b/sysdeps/unix/readdir.c index 5d0c40fdc1..46f2caff87 100644 --- a/sysdeps/unix/readdir.c +++ b/sysdeps/unix/readdir.c @@ -30,7 +30,7 @@ Cambridge, MA 02139, USA. */ /* Read a directory entry from DIRP. */ struct dirent * -readdir (DIR *dirp) +__readdir (DIR *dirp) { struct dirent *dp; @@ -105,3 +105,4 @@ readdir (DIR *dirp) return dp; } +weak_alias (__readdir, readdir) diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index 5b3e30de89..0da9d17b07 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -18,7 +18,7 @@ getgroups - getgroups 2 __getgroups getgroups getitimer - getitimer 2 __getitimer getitimer getpid - getpid 0 __getpid getpid getpriority - getpriority 2 getpriority -getrlimit - getrlimit 2 getrlimit +getrlimit - getrlimit 2 __getrlimit getrlimit getuid - getuid 0 __getuid getuid ioctl - ioctl 3 __ioctl ioctl kill - kill 2 __kill kill @@ -33,7 +33,7 @@ readlink - readlink 3 __readlink readlink readv - readv 3 readv reboot - reboot 1 reboot rename - rename 2 rename -rmdir - rmdir 1 __rmdir rmdir +rmdir - rmdir 1 __rmdir rmdir select - select 5 __select select setdomain - setdomainname 2 setdomainname setegid - setegid 1 __setegid setegid diff --git a/sysdeps/unix/sysv/linux/alpha/resourcebits.h b/sysdeps/unix/sysv/linux/alpha/resourcebits.h new file mode 100644 index 0000000000..a53d523a1e --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/resourcebits.h @@ -0,0 +1,63 @@ +/* Bit values for resource limits. Linux/Alpha version. +Copyright (C) 1996 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 +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. + +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. */ + +/* These are the values for Linux/Alpha. */ + +/* Kinds of resource limit. */ +enum __rlimit_resource + { + /* Per-process CPU limit, in seconds. */ + RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU + /* Largest file that can be created, in bytes. */ + RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE + /* Maximum size of data segment, in bytes. */ + RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA + /* Maximum size of stack segment, in bytes. */ + RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK + /* Largest core file that can be created, in bytes. */ + RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE + /* Largest resident set size, in bytes. + This affects swapping; processes that are exceeding their + resident set size will be more likely to have physical memory + taken from them. */ + RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS + /* Number of open files. */ + RLIMIT_OFILE, +#define RLIMIT_OFILE RLIMIT_OFILE + RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE + /* Address space limit. */ + RLIMIT_AS, +#define RLIMIT_AS RLIMIT_AS + /* Number of processes. */ + RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC + /* Locked-in-memory address space. */ + RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + + RLIMIT_NLIMITS, /* Number of limit flavors. */ + RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same. */ + }; diff --git a/sysdeps/unix/sysv/linux/i386/resourcebits.h b/sysdeps/unix/sysv/linux/i386/resourcebits.h new file mode 100644 index 0000000000..b4713bf3d6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/resourcebits.h @@ -0,0 +1,63 @@ +/* Bit values for resource limits. Linux/i386 version. +Copyright (C) 1996 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 +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. + +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. */ + +/* These are the values for Linux/i386. */ + +/* Kinds of resource limit. */ +enum __rlimit_resource + { + /* Per-process CPU limit, in seconds. */ + RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU + /* Largest file that can be created, in bytes. */ + RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE + /* Maximum size of data segment, in bytes. */ + RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA + /* Maximum size of stack segment, in bytes. */ + RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK + /* Largest core file that can be created, in bytes. */ + RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE + /* Largest resident set size, in bytes. + This affects swapping; processes that are exceeding their + resident set size will be more likely to have physical memory + taken from them. */ + RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS + /* Number of processes. */ + RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC + /* Number of open files. */ + RLIMIT_OFILE, +#define RLIMIT_OFILE RLIMIT_OFILE + RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE + /* Locked-in-memory address space. */ + RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + /* Address space limit. */ + RLIMIT_AS, +#define RLIMIT_AS RLIMIT_AS + + RLIMIT_NLIMITS, /* Number of limit flavors. */ + RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same. */ + }; diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index a63200c1ae..aa7d9c4ac0 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -20,6 +20,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <sysdep.h> #include <fpu_control.h> +#include <linux/personality.h> #include "init-first.h" extern void __libc_init (int, char **, char **); @@ -28,6 +29,11 @@ extern void __libc_global_ctors (void); /* The function is called from assembly stubs the compiler can't see. */ static void init (void *) __attribute__ ((unused)); +extern int __libc_is_static; +#ifdef PIC +weak_extern (__libc_is_static) +#endif + static void init (void *data) { @@ -37,15 +43,36 @@ init (void *data) char **argv = (char **)data + 1; char **envp = &argv[argc + 1]; - /* The `personality' system call takes one argument that chooses the - "personality", i.e. the set of system calls and such. Zero is the - native Linux value; we must make this call first thing to disable - emulation of some other system that might have been enabled by default - based on the executable format. */ - __personality (0); - - /* Set the FPU control word to the proper default value. */ - __setfpucw (__fpu_control); +#ifdef PIC + if (&__libc_is_static != NULL) +#endif + { +#ifdef PIC + /* We must not call `personality' twice. */ + if (__libc_is_static == 0) +#endif + { + /* The `personality' system call takes one argument that + chooses the "personality", i.e. the set of system calls + and such. We must make this call first thing to disable + emulation of some other system that might have been + enabled by default based on the executable format. */ + __personality (PER_LINUX); + + /* Set the FPU control word to the proper default value. */ + __setfpucw (__fpu_control); + } + + /* We set LIBC_IS_STATIC to a value > 0 for the static library + and < 0 for the shared library. This information might be + useful for the running program but it is mainly necessary for + the above `if' statement. */ +#ifdef PIC + __libc_is_static = -1; +#else + __libc_is_static = 1; +#endif + } __environ = envp; __libc_init (argc, argv, envp); diff --git a/sysdeps/unix/sysv/linux/resourcebits.h b/sysdeps/unix/sysv/linux/m68k/resourcebits.h index 9cd6ab46d8..65cc6e550a 100644 --- a/sysdeps/unix/sysv/linux/resourcebits.h +++ b/sysdeps/unix/sysv/linux/m68k/resourcebits.h @@ -1,4 +1,4 @@ -/* Bit values for resource limits. Linux version. +/* Bit values for resource limits. Linux/m68k version. Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,33 +17,43 @@ 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. */ -/* These are the values for Linux. */ +/* These are the values for Linux/m68k. */ /* Kinds of resource limit. */ enum __rlimit_resource { /* Per-process CPU limit, in seconds. */ RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU /* Largest file that can be created, in bytes. */ RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE /* Maximum size of data segment, in bytes. */ RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA /* Maximum size of stack segment, in bytes. */ RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK /* Largest core file that can be created, in bytes. */ RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE /* Largest resident set size, in bytes. This affects swapping; processes that are exceeding their resident set size will be more likely to have physical memory taken from them. */ RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS /* Number of processes. */ RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC /* Number of open files. */ RLIMIT_OFILE, +#define RLIMIT_OFILE RLIMIT_OFILE RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE /* Locked-in-memory address space. */ RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK RLIMIT_NLIMITS, /* Number of limit flavors. */ RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same. */ diff --git a/sysdeps/unix/sysv/linux/mips/resourcebits.h b/sysdeps/unix/sysv/linux/mips/resourcebits.h new file mode 100644 index 0000000000..095f40b09c --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/resourcebits.h @@ -0,0 +1,65 @@ +/* Bit values for resource limits. Linux/MIPS version. +Copyright (C) 1996 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 +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. + +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. */ + +/* These are the values for Linux/MIPS. */ + +/* Kinds of resource limit. */ +enum __rlimit_resource + { + /* Per-process CPU limit, in seconds. */ + RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU + /* Largest file that can be created, in bytes. */ + RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE + /* Maximum size of data segment, in bytes. */ + RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA + /* Maximum size of stack segment, in bytes. */ + RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK + /* Largest core file that can be created, in bytes. */ + RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE + /* Number of open files. */ + RLIMIT_OFILE, +#define RLIMIT_OFILE RLIMIT_OFILE + RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE + /* Address space limit. */ + RLIMIT_AS, +#define RLIMIT_AS RLIMIT_AS + RLIMIT_VMEM = RLIMIT_AS, +#define RLIMIT_VMEM RLIMIT_VMEM + /* Largest resident set size, in bytes. + This affects swapping; processes that are exceeding their + resident set size will be more likely to have physical memory + taken from them. */ + RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS + /* Number of processes. */ + RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC + /* Locked-in-memory address space. */ + RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + + RLIMIT_NLIMITS, /* Number of limit flavors. */ + RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same. */ + }; diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c deleted file mode 100644 index 2ae584f164..0000000000 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 1995, 1996 Free Software Foundation, Inc. - -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. - -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. */ - -/* On Linux we must not ask __getdtablesize for te value for _SC_OPEN_MAX - because this would mean an endless loop. */ - -#include <limits.h> -#include <unistd.h> - -extern long int __default_sysconf (int name); - -long int -__sysconf (int name) -{ - if (name == _SC_OPEN_MAX) - return OPEN_MAX; - - return __default_sysconf (name); -} - -#define __sysconf __default_sysconf - -#include <sysdeps/posix/sysconf.c> diff --git a/sysdeps/unix/sysv/sysv4/getdtsz.c b/sysdeps/unix/sysv/sysv4/getdtsz.c deleted file mode 100644 index c1ae6108fb..0000000000 --- a/sysdeps/unix/sysv/sysv4/getdtsz.c +++ /dev/null @@ -1,2 +0,0 @@ -/* Solaris uses sysconf ala POSIX.1. */ -#include <sysdeps/posix/getdtsz.c> |