posix: Consolidate Linux msync syscall

This patch consolidates the msync Linux syscall generation on
sysdeps/unix/sysv/linux/msync.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.

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

diff --git a/ChangeLog b/ChangeLog
index 92e1c10dd7548d2b7404a43d0a95fe90a92e5164..caaf6050ae220682bca3c493faa63848664c522b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2017-05-18  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * misc/Makefile (CFLAGS-msync.c): New rule.
+       * nptl/Makefile (CFLAGS-msync.c): Likewise.
+       * sysdeps/unix/syscalls.list: Remove msync from auto-generation list.
+       * sysdeps/unix/sysv/linux/msync.c: New file.
+
        * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Remove file.
        * sysdeps/unix/sysv/linux/sigsuspend.c: Simplify include list.
        * nptl/Makefile (CFLAGS-sigsuspend.c): New rule.

diff --git a/misc/Makefile b/misc/Makefile
index 91e425b76f3f292798ed00c904d1a1097a78607d..0c1526a5926b0340fcdd313091fff1b18d351413 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -108,6 +108,7 @@ CFLAGS-getsysstats.c = -fexceptions
 CFLAGS-getusershell.c = -fexceptions
 CFLAGS-err.c = -fexceptions
 CFLAGS-tst-tsearch.c = $(stack-align-test-flags)
+CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables
 
 # Called during static library initialization, so turn stack-protection
 # off for non-shared builds.

diff --git a/nptl/Makefile b/nptl/Makefile
index 57eab33ac502a42e347401b6888ad531c88fa03b..3ade74fa36c17accfcc369c16f85b2db5e080b8f 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -218,6 +218,7 @@ CFLAGS-read.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-write.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-nanosleep.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-sigsuspend.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables
 
 CFLAGS-pt-system.c = -fexceptions
 

diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 2254c761b4b988ba88d6ed558ed2bcd7bc3ff464..c4135d8851c7a35ff78d8988919d2a2c52e3ebc7 100644 (file)
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -45,7 +45,6 @@ madvise               -       madvise         i:pii   __madvise       madvise
 mkdir          -       mkdir           i:si    __mkdir         mkdir
 mmap           -       mmap            b:aniiii __mmap         mmap
 mprotect       -       mprotect        i:aii   __mprotect      mprotect
-msync          -       msync           Ci:aii  __libc_msync    msync
 munmap         -       munmap          i:ai    __munmap        munmap
 open           -       open            Ci:siv  __libc_open __open open
 profil         -       profil          i:piii  __profil        profil

diff --git a/sysdeps/unix/sysv/linux/msync.c b/sysdeps/unix/sysv/linux/msync.c
new file mode 100644 (file)
index 0000000..28aba11
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/msync.c
@@ -0,0 +1,26 @@
+/* Linux synchronize a file with a memory map 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 <sys/mman.h>
+#include <sysdep-cancel.h>
+
+int
+msync (void *addr, size_t length, int flags)
+{
+  return SYSCALL_CANCEL (msync, addr, length, flags);
+}