Move <bits/mman-linux.h> to the Linux sysdeps directory

Message ID 20171104154049.765C740F88C56@oldenburg.str.redhat.com
State New
Headers show
Series
  • Move <bits/mman-linux.h> to the Linux sysdeps directory
Related show

Commit Message

Florian Weimer Nov. 4, 2017, 3:40 p.m.
The header file is no longer used on anything but Linux.

2017-11-04  Florian Weimer  <fweimer@redhat.com>

	* bits/mman-linux.h: Move ...
	* sysdeps/unix/sysv/linux/bits/mman-linux.h: ... here.  Update
	comment.
	* sysdeps/unix/sysv/linux/bits/Makefile (sysdep_headers): Remove
	outdated comment.

+++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h
@@ -21,10 +21,7 @@
 #endif
 
 /* The following definitions basically come from the kernel headers.
-   But the kernel header is not namespace clean.
-
-   This file is also used by some non-Linux configurations of the
-   GNU C Library, for other systems that use these same bit values.  */
+   But the kernel header is not namespace clean.  */
 
 
 /* Protections are chosen from these bits, OR'd together.  The

Comments

H.J. Lu Nov. 4, 2017, 6:45 p.m. | #1
On Sat, Nov 4, 2017 at 8:40 AM, Florian Weimer <fweimer@redhat.com> wrote:
> The header file is no longer used on anything but Linux.
>
> 2017-11-04  Florian Weimer  <fweimer@redhat.com>
>
>         * bits/mman-linux.h: Move ...
>         * sysdeps/unix/sysv/linux/bits/mman-linux.h: ... here.  Update
>         comment.
>         * sysdeps/unix/sysv/linux/bits/Makefile (sysdep_headers): Remove
>         outdated comment.
>
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 3a5515d092..53e41510e3 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -28,13 +28,6 @@ CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables
>  CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables
>  CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"
>
> -# Note that bits/mman-linux.h is listed here though the file lives in the
> -# top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/.
> -# That is just so that other (non-Linux) configurations for whom the
> -# bits/mman-linux.h definitions work well do not have to duplicate the
> -# contents of the file.  The file must still be listed in sysdep_headers
> -# here and in any non-Linux configuration that uses it; other
> -# configurations will not install the file.
>  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
>                   sys/klog.h \
>                   sys/user.h sys/prctl.h \
> diff --git a/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h
> similarity index 96%
> rename from bits/mman-linux.h
> rename to sysdeps/unix/sysv/linux/bits/mman-linux.h
> +++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h
> @@ -21,10 +21,7 @@
>  #endif
>
>  /* The following definitions basically come from the kernel headers.
> -   But the kernel header is not namespace clean.
> -
> -   This file is also used by some non-Linux configurations of the
> -   GNU C Library, for other systems that use these same bit values.  */
> +   But the kernel header is not namespace clean.  */
>
>
>  /* Protections are chosen from these bits, OR'd together.  The


LGTM.

Thanks.

Patch

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 3a5515d092..53e41510e3 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -28,13 +28,6 @@  CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"
 
-# Note that bits/mman-linux.h is listed here though the file lives in the
-# top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/.
-# That is just so that other (non-Linux) configurations for whom the
-# bits/mman-linux.h definitions work well do not have to duplicate the
-# contents of the file.  The file must still be listed in sysdep_headers
-# here and in any non-Linux configuration that uses it; other
-# configurations will not install the file.
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/klog.h \
 		  sys/user.h sys/prctl.h \
diff --git a/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h
similarity index 96%
rename from bits/mman-linux.h
rename to sysdeps/unix/sysv/linux/bits/mman-linux.h