diff options
| author | Andreas Jaeger <aj@suse.de> | 2000-08-12 10:01:20 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2000-08-12 10:01:20 +0000 |
| commit | facd11c28e11834052d048c603dac4c99ab2aeaa (patch) | |
| tree | 8021819fd1f004ea500b0000989ecba7ab485827 | |
| parent | e762517de285049715f8a5ff53a760bd7e33fe15 (diff) | |
| download | glibc-facd11c28e11834052d048c603dac4c99ab2aeaa.tar.gz glibc-facd11c28e11834052d048c603dac4c99ab2aeaa.tar.xz glibc-facd11c28e11834052d048c603dac4c99ab2aeaa.zip | |
Update.
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_GETLK64, F_SETLK64, F_SETLKW64): Define with F_GETLK etc.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/fcntl.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/fcntl.c | 2 |
4 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 35b1d1fa49..8641090229 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ 2000-08-12 Andreas Jaeger <aj@suse.de> + * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_GETLK64, + F_SETLK64, F_SETLKW64): Define with F_GETLK etc. + * sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Add .set mips2 for assembler. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 84f67b8705..489fbcec0b 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2000-08-12 Andreas Jaeger <aj@suse.de> + + * sysdeps/mips/pt-machine.h (testandset): Add .set mips2 for + assembler. + (__compare_and_swap): Likewise. + * sysdeps/mips/pspinlock.c (__pthread_spin_lock): Likewise. + 2000-08-10 Ulrich Drepper <drepper@redhat.com> * pthread.c (__pthread_initial_thread): Initialize p_errnop and diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h index 7184d08a4a..2b879dcd8f 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h @@ -71,11 +71,9 @@ #define F_GETLK 7 /* Get record locking info. */ #define F_SETLK 8 /* Set record locking info (non-blocking). */ #define F_SETLKW 9 /* Set record locking info (blocking). */ - -/* XXX missing */ -#define F_GETLK64 7 /* Get record locking info. */ -#define F_SETLK64 8 /* Set record locking info (non-blocking). */ -#define F_SETLKW64 9 /* Set record locking info (blocking). */ +#define F_GETLK64 F_GETLK /* Get record locking info. */ +#define F_SETLK64 F_SETLK /* Set record locking info (non-blocking). */ +#define F_SETLKW64 F_SETLKW /* Set record locking info (blocking). */ #if defined __USE_BSD || defined __USE_XOPEN2K # define F_SETOWN 5 /* Get owner of socket (receiver of SIGIO). */ diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c index dbd47f5847..962249a855 100644 --- a/sysdeps/unix/sysv/linux/i386/fcntl.c +++ b/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -27,7 +27,7 @@ #if __ASSUME_FCNTL64 == 0 /* This variable is shared with all files that check for fcntl64. */ -static int __have_no_fcntl64; +int __have_no_fcntl64; #endif int |