From patchwork Sat Nov 4 15:40:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 24094 Received: (qmail 79404 invoked by alias); 4 Nov 2017 15:40:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 78525 invoked by uid 89); 4 Nov 2017 15:40:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=HX-Greylist:Sat X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C0E1A356CF Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=fweimer@redhat.com Date: Sat, 04 Nov 2017 16:40:49 +0100 To: libc-alpha@sourceware.org Subject: [PATCH] Move to the Linux sysdeps directory User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20171104154049.765C740F88C56@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) The header file is no longer used on anything but Linux. 2017-11-04 Florian Weimer * 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 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