From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 84E76386102D; Sun, 4 Dec 2022 13:27:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 84E76386102D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670160472; bh=4zKBS34nryWTi4O3yQFhVWWVRFLyE1q2AVp5+mFLcLo=; h=From:To:Subject:Date:From; b=YxxaGQ8InoMqpZpHXduawtHagIh4+hR1wi/UN9YNWZbewWRFdPC3WQDPaJi3H+M5Y QuZhx/5IMHJ57J4pYxMNknat3Mz22VSGI1Ohs03/brYcICYt7q6a+ILBZaOfmURt2k JgEcVRY4n9mruvVvKnYQ65qG8+2bZaDg7Dn8lppc= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop wincap::mmap_storage_high X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 8af023a357fba8974be89af41a6c42d09374ac46 X-Git-Newrev: ae2829a2269010230506e08a550b80e43d2083cc Message-Id: <20221204132752.84E76386102D@sourceware.org> Date: Sun, 4 Dec 2022 13:27:52 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dae2829a2269= 010230506e08a550b80e43d2083cc commit ae2829a2269010230506e08a550b80e43d2083cc Author: Corinna Vinschen AuthorDate: Tue Nov 15 17:46:52 2022 +0100 Commit: Corinna Vinschen CommitDate: Sun Dec 4 14:01:41 2022 +0100 Cygwin: drop wincap::mmap_storage_high =20 Only required for Windows 7 and Windows 8. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/local_includes/memory_layout.h | 9 ++------- winsup/cygwin/local_includes/wincap.h | 2 -- winsup/cygwin/wincap.cc | 12 ------------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/winsup/cygwin/local_includes/memory_layout.h b/winsup/cygwin/l= ocal_includes/memory_layout.h index 83ccf8f65817..6a4b7a28a11c 100644 --- a/winsup/cygwin/local_includes/memory_layout.h +++ b/winsup/cygwin/local_includes/memory_layout.h @@ -53,11 +53,6 @@ details. */ #define USERHEAP_START 0xa00000000UL =20 /* The memory region used for memory maps. Mmaps grow downwards. - Set the lowest address to leave ~32 Gigs for heap. - - Up to Win 8 we only have a 44 bit address space, 48 bit address space - starting with 8.1, so the max value is a system-specific variable. */ + Set the lowest address to leave ~32 Gigs for heap. */ #define MMAP_STORAGE_LOW 0x001000000000UL -#define __MMAP_STORAGE_HIGH_LEGACY 0x070000000000UL -#define __MMAP_STORAGE_HIGH 0x700000000000UL -#define MMAP_STORAGE_HIGH wincap.mmap_storage_high () +#define MMAP_STORAGE_HIGH 0x700000000000UL diff --git a/winsup/cygwin/local_includes/wincap.h b/winsup/cygwin/local_in= cludes/wincap.h index 96bd68a93f95..d5579e7ea71a 100644 --- a/winsup/cygwin/local_includes/wincap.h +++ b/winsup/cygwin/local_includes/wincap.h @@ -12,7 +12,6 @@ details. */ struct wincaps { DWORD def_guard_pages; - int64_t mmap_storage_high; /* The bitfields must be 8 byte aligned on x86_64, otherwise the bitfield ops generated by gcc are off by 4 bytes. */ struct __attribute__ ((aligned (8))) { @@ -67,7 +66,6 @@ public: { return ((wincaps *) this->caps)->def_guard_pages * page_size (); } - intptr_t IMPLEMENT (mmap_storage_high) bool IMPLEMENT (is_server) bool IMPLEMENT (has_new_pebteb_region) bool IMPLEMENT (has_unprivileged_createsymlink) diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index f83eed8a7e1a..7aefde48cb49 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -21,7 +21,6 @@ details. */ =20 wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = =3D { def_guard_pages:2, - mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY, { is_server:false, has_new_pebteb_region:false, @@ -45,7 +44,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_com= mon"), shared)) =3D { =20 wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY, { is_server:false, has_new_pebteb_region:false, @@ -69,7 +67,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_com= mon"), shared)) =3D { =20 wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared))= =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:false, @@ -93,7 +90,6 @@ wincaps wincap_8_1 __attribute__((section (".cygwin_dll_c= ommon"), shared)) =3D { =20 wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), sha= red)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:false, @@ -117,7 +113,6 @@ wincaps wincap_10_1507 __attribute__((section (".cygwi= n_dll_common"), shared)) =20 wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), sha= red)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:false, @@ -141,7 +136,6 @@ wincaps wincap_10_1607 __attribute__((section (".cygwi= n_dll_common"), shared)) =20 wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -165,7 +159,6 @@ wincaps wincap_10_1703 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -189,7 +182,6 @@ wincaps wincap_10_1709 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -213,7 +205,6 @@ wincaps wincap_10_1803 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -237,7 +228,6 @@ wincaps wincap_10_1809 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -261,7 +251,6 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shar= ed)) =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true, @@ -285,7 +274,6 @@ wincaps wincap_10_2004 __attribute__((section (".cygwin= _dll_common"), shared)) =3D =20 wincaps wincap_11 __attribute__((section (".cygwin_dll_common"), shared)) = =3D { def_guard_pages:3, - mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, has_new_pebteb_region:true,