From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id E2DAC3858C39; Tue, 9 Apr 2024 12:22:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2DAC3858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712665374; bh=Fvc8c7FH/RqLqszrnXkk9JfZJmzpVeb2a/EpvX6Qxi8=; h=From:To:Subject:Date:From; b=i4jEwizGnMqG5lTIThSFP8vPj20nxmYYe2bhUEQZCgXVrVy7vfXl6u5EyePwGrZNx SgFIT+FPzUFSDHMOUTFC4DGGZavDVN8gyS4oJqWFToO24p2oIRLXze8e4FTYLGvIbN D7eTN1JYe431kPOfvTt3QKIQey2lXhegZ7Tnq3vs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: H.J. Lu To: binutils-cvs@sourceware.org Subject: [binutils-gdb] bfd: Define pagesize variables only for mmap X-Act-Checkin: binutils-gdb X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: cd714ac07cbe6a9206df3bc81607818b272399f9 X-Git-Newrev: 56756c571eb6d33eb8035cf0deb37e472597af6b Message-Id: <20240409122254.E2DAC3858C39@sourceware.org> Date: Tue, 9 Apr 2024 12:22:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D56756c571eb6= d33eb8035cf0deb37e472597af6b commit 56756c571eb6d33eb8035cf0deb37e472597af6b Author: H.J. Lu Date: Mon Apr 8 19:39:23 2024 -0700 bfd: Define pagesize variables only for mmap =20 Define _bfd_pagesize, _bfd_pagesize_m1 and _bfd_minimum_mmap_size only if HAVE_MMAP is defined. =20 * libbfd-in.h (_bfd_pagesize): Declare only if HAVE_MMAP is defined. (_bfd_pagesize_m1): Likewise. (_bfd_minimum_mmap_size): Likewise. * libbfd.c (_bfd_pagesize): Define only if HAVE_MMAP is defined. (_bfd_pagesize_m1): Likewise. (_bfd_minimum_mmap_size): Likewise. (bfd_init_pagesize): Likewise. * lynx-core.c (lynx_core_file_p): Replace _bfd_pagesize with getpagesize. Diff: --- bfd/libbfd-in.h | 2 ++ bfd/libbfd.c | 2 ++ bfd/libbfd.h | 2 ++ bfd/lynx-core.c | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 7bfc58f12d8..81898d406ab 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -848,9 +848,11 @@ extern bfd_byte * _bfd_write_unsigned_leb128 extern struct bfd_link_info *_bfd_get_link_info (bfd *) ATTRIBUTE_HIDDEN; =20 +#ifdef HAVE_MMAP extern uintptr_t _bfd_pagesize ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_pagesize_m1 ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_minimum_mmap_size ATTRIBUTE_HIDDEN; +#endif =20 #if GCC_VERSION >=3D 7000 #define _bfd_mul_overflow(a, b, res) __builtin_mul_overflow (a, b, res) diff --git a/bfd/libbfd.c b/bfd/libbfd.c index 86366e496c5..e92ed5e18a2 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -1572,6 +1572,7 @@ _bfd_generic_init_private_section_data (bfd *ibfd ATT= RIBUTE_UNUSED, return true; } =20 +#ifdef HAVE_MMAP uintptr_t _bfd_pagesize; uintptr_t _bfd_pagesize_m1; uintptr_t _bfd_minimum_mmap_size; @@ -1587,3 +1588,4 @@ bfd_init_pagesize (void) /* The minimum section size to use mmap. */ _bfd_minimum_mmap_size =3D _bfd_pagesize * 4; } +#endif diff --git a/bfd/libbfd.h b/bfd/libbfd.h index bed7d88d4ec..bfe3c6f1762 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -854,9 +854,11 @@ extern bfd_byte * _bfd_write_unsigned_leb128 extern struct bfd_link_info *_bfd_get_link_info (bfd *) ATTRIBUTE_HIDDEN; =20 +#ifdef HAVE_MMAP extern uintptr_t _bfd_pagesize ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_pagesize_m1 ATTRIBUTE_HIDDEN; extern uintptr_t _bfd_minimum_mmap_size ATTRIBUTE_HIDDEN; +#endif =20 #if GCC_VERSION >=3D 7000 #define _bfd_mul_overflow(a, b, res) __builtin_mul_overflow (a, b, res) diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c index 9ec5a0d2028..44d94ad8745 100644 --- a/bfd/lynx-core.c +++ b/bfd/lynx-core.c @@ -96,7 +96,7 @@ lynx_core_file_p (bfd *abfd) asection *newsect; size_t amt; =20 - pagesize =3D _bfd_pagesize; /* Serious cross-target issue here... This + pagesize =3D getpagesize (); /* Serious cross-target issue here... This really needs to come from a system-specific header file. */