GNU C Library master sources branch master updated. glibc-2.26.9000-817-g7911dd4

[fw at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7911dd47da73026acc930564c10a1ceeb68d8583 (commit)
      from  c45d78aac47db08bc8ea7641c5330cccaecd3ddb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7911dd47da73026acc930564c10a1ceeb68d8583

commit 7911dd47da73026acc930564c10a1ceeb68d8583
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Nov 24 17:55:59 2017 +0100

    Linux: Introduce <bits/mman-shared.h>
    
    This header file enables sharing of portable declarations and
    definitions across all Linux architectures, including hppa (which does
    not use <bits/mman-linux.h>).
    
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 6791c51..9acf3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-11-24  Florian Weimer  <fweimer@redhat.com>
+
+	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
+	bits/mman-shared.h.
+	* sysdeps/unix/sysv/linux/bits/mman-linux.h: Include
+	<bits/mman-shared.h>.
+	(MFD_CLOEXEC, MFD_ALLOW_SEALING, MFD_HUGETLB, memfd_create): Move
+	to ...
+	* sysdeps/unix/sysv/linux/bits/mman-shared.h: ... this new file.
+	Add #ifndef guard for the MFD_* constants based on MFD_CLOEXEC.
+	* sysdeps/unix/sysv/linux/hppa/bits/mman.h: Include
+	<bits/mman-shared.h>.
+
 2017-11-24  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	[BZ #22457]
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index c484d26..58ce07b 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -39,7 +39,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \
 		  bits/signalfd.h bits/timerfd.h bits/epoll.h \
 		  bits/socket_type.h bits/syscall.h bits/sysctl.h \
-		  bits/mman-linux.h \
+		  bits/mman-linux.h bits/mman-shared.h \
 		  bits/siginfo-arch.h bits/siginfo-consts-arch.h
 
 tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h
index 1ffa549..ba40fd6 100644
--- a/sysdeps/unix/sysv/linux/bits/mman-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h
@@ -112,18 +112,4 @@
 					   faulted in.  */
 #endif
 
-#ifdef __USE_GNU
-/* Flags for memfd_create.  */
-# define MFD_CLOEXEC 1U
-# define MFD_ALLOW_SEALING 2U
-# define MFD_HUGETLB 4U
-
-__BEGIN_DECLS
-
-/* Create a new memory file descriptor.  NAME is a name for debugging.
-   FLAGS is a combination of the MFD_* constants.  */
-int memfd_create (const char *__name, unsigned int __flags) __THROW;
-
-__END_DECLS
-
-#endif /* __USE_GNU */
+#include <bits/mman-shared.h>
diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h
new file mode 100644
index 0000000..5bbcbbc
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h
@@ -0,0 +1,39 @@
+/* Memory-mapping-related declarations/definitions, not architecture-specific.
+   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/>.  */
+
+#ifndef _SYS_MMAN_H
+# error "Never use <bits/mman-shared.h> directly; include <sys/mman.h> instead."
+#endif
+
+#ifdef __USE_GNU
+/* Flags for memfd_create.  */
+# ifndef MFD_CLOEXEC
+#  define MFD_CLOEXEC 1U
+#  define MFD_ALLOW_SEALING 2U
+#  define MFD_HUGETLB 4U
+# endif
+
+__BEGIN_DECLS
+
+/* Create a new memory file descriptor.  NAME is a name for debugging.
+   FLAGS is a combination of the MFD_* constants.  */
+int memfd_create (const char *__name, unsigned int __flags) __THROW;
+
+__END_DECLS
+
+#endif /* __USE_GNU */
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index 2aaca01..68a7afc 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -110,3 +110,5 @@
 # define POSIX_MADV_WILLNEED	3 /* Will need these pages.  */
 # define POSIX_MADV_DONTNEED	4 /* Don't need these pages.  */
 #endif
+
+#include <bits/mman-shared.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   13 +++++++
 sysdeps/unix/sysv/linux/Makefile                   |    2 +-
 sysdeps/unix/sysv/linux/bits/mman-linux.h          |   16 +---------
 .../sysv/linux/bits/mman-shared.h}                 |   34 +++++++++++---------
 sysdeps/unix/sysv/linux/hppa/bits/mman.h           |    2 +
 5 files changed, 36 insertions(+), 31 deletions(-)
 copy sysdeps/{x86_64/multiarch/strncpy.c => unix/sysv/linux/bits/mman-shared.h} (60%)


hooks/post-receive
-- 
GNU C Library master sources