diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | io/Makefile | 1 | ||||
| -rw-r--r-- | io/tst-fcntl-lock-lfs.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS index c339cb444e..8156572cdf 100644 --- a/NEWS +++ b/NEWS @@ -133,6 +133,8 @@ The following bugs are resolved with this release: [30579] malloc: trim_threshold in realloc lead to high memory usage [30662] nscd: Group and password cache use errno in place of errval [30723] posix_memalign repeatedly scans long bin lists + [30804] F_GETLK, F_SETLK, and F_SETLKW value change for powerpc64 with + -D_FILE_OFFSET_BITS=64 Version 2.37 diff --git a/io/Makefile b/io/Makefile index 6ccc0e8691..8a3c83a3bb 100644 --- a/io/Makefile +++ b/io/Makefile @@ -192,6 +192,7 @@ tests := \ tst-fchownat \ tst-fcntl \ tst-fcntl-lock \ + tst-fcntl-lock-lfs \ tst-fstatat \ tst-fts \ tst-fts-lfs \ diff --git a/io/tst-fcntl-lock-lfs.c b/io/tst-fcntl-lock-lfs.c new file mode 100644 index 0000000000..f2a909fb02 --- /dev/null +++ b/io/tst-fcntl-lock-lfs.c @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include <io/tst-fcntl-lock.c> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h index f7615a447e..d8a291a331 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -33,7 +33,7 @@ # define __O_LARGEFILE 0200000 #endif -#if __WORDSIZE == 64 +#if __WORDSIZE == 64 && !defined __USE_FILE_OFFSET64 # define F_GETLK 5 # define F_SETLK 6 # define F_SETLKW 7 |