aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--io/test-lfs.c21
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c36
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list4
4 files changed, 68 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d8300bc..4d0912a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2017-01-02 Joseph Myers <joseph@codesourcery.com>
+ [BZ #21019]
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list (lseek64):
+ New syscall entry.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c: New file.
+ * io/test-lfs.c (do_test): Test offset returned from lseek64 and
+ lseek.
+
* scripts/build-many-glibcs.py (Context.add_all_configs): Add
power4 glibc for powerpc-linux-gnu.
diff --git a/io/test-lfs.c b/io/test-lfs.c
index 5d976c7..1477354 100644
--- a/io/test-lfs.c
+++ b/io/test-lfs.c
@@ -163,6 +163,27 @@ do_test (int argc, char *argv[])
error (0, errno, "lseek64 failed with error");
exit (EXIT_FAILURE);
}
+ off64_t offset64 = lseek64 (fd, 0, SEEK_CUR);
+ if (offset64 != TWO_GB + 100)
+ {
+ error (0, 0, "lseek64 did not return expected offset");
+ exit (EXIT_FAILURE);
+ }
+ off_t offset = lseek (fd, 0, SEEK_CUR);
+ if (sizeof (off_t) < sizeof (off64_t))
+ {
+ if (offset != -1 || errno != EOVERFLOW)
+ {
+ error (0, 0, "lseek did not fail with EOVERFLOW");
+ exit (EXIT_FAILURE);
+ }
+ }
+ else
+ if (offset != TWO_GB + 100)
+ {
+ error (0, 0, "lseek did not return expected offset");
+ exit (EXIT_FAILURE);
+ }
ret = write (fd, "Hello", 5);
if (ret == -1 && errno == EFBIG)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c b/sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c
new file mode 100644
index 0000000..26d2e11
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c
@@ -0,0 +1,36 @@
+/* MIPS n32 lseek implementation.
+ Copyright (C) 2017 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 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <errno.h>
+
+off_t
+__lseek (int fd, off_t offset, int whence)
+{
+ off64_t res = __lseek64 (fd, offset, whence);
+ if (res != (off_t) res)
+ {
+ __set_errno (EOVERFLOW);
+ return (off_t) -1;
+ }
+ return (off_t) res;
+}
+libc_hidden_def (__lseek)
+weak_alias (__lseek, lseek)
+strong_alias (__lseek, __libc_lseek)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
index 58fd46a..7af317f 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list
@@ -1,5 +1,9 @@
# File name Caller Syscall name # args Strong name Weak names
+# C syscall macros cannot be used because this syscall has a 64-bit
+# return value.
+lseek64 - lseek i:iii __lseek64 __libc_lseek64 lseek64 llseek
+
mmap64 - mmap b:aniiii __mmap64 mmap64
readahead - readahead i:iii __readahead readahead