posix: Consolidate Linux nanosleep syscall

This patch consolidates the nanosleep Linux syscall generation on
sysdeps/unix/sysv/linux/nanosleep.c.  It basically removes it from
architectures auto-generation list.

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
arch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu,
sparc64-linux-gnu, and sparcv9-linux-gnu.

	* nptl/Makefile (CFLAGS-nanosleep.c): New rule.
	* posix/Makefile (CFLAGS-nanosleep.c): Likewise.
	* sysdeps/unix/sysv/linux/nanosleep.c: New file.
	* sysdeps/unix/sysv/linux/syscalls.list: Remove nanosleep from
	auto-generated list.

diff --git a/ChangeLog b/ChangeLog
index 98dad73e7b9fff11de5b8ef545052fae9bf6bf39..7bc0ce4cecdd243e68c5b254c73dc9fa076fadc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-05-18  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * nptl/Makefile (CFLAGS-nanosleep.c): New rule.
+       * posix/Makefile (CFLAGS-nanosleep.c): Likewise.
+       * sysdeps/unix/sysv/linux/nanosleep.c: New file.
+       * sysdeps/unix/sysv/linux/syscalls.list: Remove nanosleep from
+       auto-generated list.
+
        * sysdeps/unix/sysv/linux/sh/syscalls.list: Remove waitid from
        auto-generated list.
        * sysdeps/unix/sysv/linux/m68k/syscalls.list: Likewise.

diff --git a/nptl/Makefile b/nptl/Makefile
index d39bb508478897e856d3e24f9a4f2207b781d1be..cdf69bd033b3082d356fca14a4d7df906c0622d5 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -216,6 +216,7 @@ CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-close.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-read.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-write.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-nanosleep.c = -fexceptions -fasynchronous-unwind-tables
 
 CFLAGS-pt-system.c = -fexceptions
 

diff --git a/posix/Makefile b/posix/Makefile
index a78ca3dd717f57b5c448a102840c09d35f20c5c0..52b022cf66a83cd694beca37c58eb80f724b9378 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -231,6 +231,7 @@ CFLAGS-execle.os = -fomit-frame-pointer
 CFLAGS-execl.os = -fomit-frame-pointer
 CFLAGS-execvp.os = -fomit-frame-pointer
 CFLAGS-execlp.os = -fomit-frame-pointer
+CFLAGS-nanosleep.c = -fexceptions -fasynchronous-unwind-tables
 
 tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \
                --none random --col --color --colour

diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c
new file mode 100644 (file)
index 0000000..b352f84
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/nanosleep.c
@@ -0,0 +1,30 @@
+/* Linux high resolution nanosleep 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 <time.h>
+#include <sysdep-cancel.h>
+
+/* Pause execution for a number of nanoseconds.  */
+int
+__nanosleep (const struct timespec *requested_time,
+            struct timespec *remaining)
+{
+  return SYSCALL_CANCEL (nanosleep, requested_time, remaining);
+}
+libc_hidden_def (__nanosleep)
+weak_alias (__nanosleep, nanosleep)

diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index eab30dda06773b5246b314fa191ca13be3fc012e..7fca6f827b0a6880f6d4dc84fb4507db37ef57cd 100644 (file)
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -42,7 +42,6 @@ mount         EXTRA   mount           i:sssip __mount mount
 mremap         EXTRA   mremap          b:ainip __mremap        mremap
 munlock                -       munlock         i:ai    munlock
 munlockall     -       munlockall      i:      munlockall
-nanosleep      -       nanosleep       Ci:pp   __nanosleep     nanosleep
 nfsservctl     EXTRA   nfsservctl      i:ipp   nfsservctl
 pipe           -       pipe            i:f     __pipe          pipe
 pipe2          -       pipe2           i:fi    __pipe2         pipe2