diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index f33bc686ba..e6b3d87281 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 1999-12-09 Ulrich Drepper <drepper@cygnus.com> + * sysdeps/unix/sysv/linux/i386/Makefile: Add rules for + oldgetrlimit and oldsetrlimit. + * sysdeps/unix/sysv/linux/i386/syscalls.list: Add oldgetrlimit and + oldsetrlimit. + * sysdeps/unix/sysv/linux/Makefile: Move oldgetrlimit and + oldsetrlimit rules into 32-bit arch subdirs. + * sysdeps/unix/sysv/linux/syscalls.list: Likewise. + * locale/programs/ld-collate.c (insert_value): If this is the first symbol the cursor can be the same as the next pointer. diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 4c5b7ea612..4d7594d1ec 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -106,7 +106,3 @@ endif ifeq ($(subdir),nis) CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1 endif - -ifeq ($(subdir),resource) -sysdep_routines += oldgetrlimit64 oldsetrlimit64 -endif diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 38987e4202..ec48acd7e6 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -11,3 +11,7 @@ endif ifeq ($(subdir),csu) CFLAGS-initfini.s += -DWEAK_GMON_START endif + +ifeq ($(subdir),resource) +sysdep_routines += oldgetrlimit oldsetrlimit +endif diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 84b5a8afa5..3cf0d30340 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -2,3 +2,5 @@ modify_ldt EXTRA modify_ldt 3 __modify_ldt modify_ldt vm86 - vm86 1 __vm86 vm86 +oldgetrlimit EXTRA getrlimit 2 __old_getrlimit getrlimit@GLIBC_2.0 +oldsetrlimit EXTRA setrlimit 2 __old_setrlimit setrlimit@GLIBC_2.0 diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 50f1cc9803..6215973fc3 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -33,8 +33,6 @@ munlock EXTRA munlock 2 __munlock munlock munlockall EXTRA munlockall 0 __munlockall munlockall nanosleep - nanosleep 2 __libc_nanosleep __nanosleep nanosleep nfsservctl EXTRA nfsservctl 3 nfsservctl -oldgetrlimit EXTRA getrlimit 2 __old_getrlimit getrlimit@GLIBC_2.0 -oldsetrlimit EXTRA setrlimit 2 __old_setrlimit setrlimit@GLIBC_2.0 pause - pause 0 __libc_pause pause personality init-first personality 1 __personality personality pipe - pipe 1 __pipe pipe |