public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-7513] libstdc++: Fix configure test for 32-bit targets
Date: Thu, 29 Jun 2023 23:01:35 +0000 (GMT)	[thread overview]
Message-ID: <20230629230135.4D9D1385697D@sourceware.org> (raw)

https://gcc.gnu.org/g:b7b70cba6564e2988f6430e5238d97b5389a6f1d

commit r13-7513-gb7b70cba6564e2988f6430e5238d97b5389a6f1d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed May 31 19:05:32 2023 +0100

    libstdc++: Fix configure test for 32-bit targets
    
    The -mlarge model for msp430-elf uses 20-bit pointers, which means that
    sizeof(void*) == 4 and so the r14-1432-g51cf0b3949b88b change gives the
    wrong answer. Check __INTPTR_WIDTH__ >= 32 instead.
    
    libstdc++-v3/ChangeLog:
    
            * acinclude.m4 (GLIBCXX_ZONEINFO_DIR): Fix for 32-bit pointers
            to check __INT_PTR_WIDTH__ instead of sizeof(void*).
            * configure: Regenerate.
    
    (cherry picked from commit 2a919c08abb2cc5aeb31abb400b3489f67467dbf)

Diff:
---
 libstdc++-v3/acinclude.m4 | 2 +-
 libstdc++-v3/configure    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 6f2c4374048..4adf23a771d 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5202,7 +5202,7 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [
 	;;
     esac
 
-    AC_COMPUTE_INT(glibcxx_cv_at_least_32bit, [sizeof(void*) >= 4])
+    AC_COMPUTE_INT(glibcxx_cv_at_least_32bit, [__INTPTR_WIDTH__ >= 32])
     if test "$glibcxx_cv_at_least_32bit" -ne 0; then
       # Also embed a copy of the tzdata.zi file as a static string.
       embed_zoneinfo=yes
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 95b8a8de649..02a931cd096 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71558,7 +71558,7 @@ fi
 	;;
     esac
 
-    if ac_fn_c_compute_int "$LINENO" "sizeof(void*) >= 4" "glibcxx_cv_at_least_32bit"        ""; then :
+    if ac_fn_c_compute_int "$LINENO" "__INTPTR_WIDTH__ >= 32" "glibcxx_cv_at_least_32bit"        ""; then :
 
 fi

                 reply	other threads:[~2023-06-29 23:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230629230135.4D9D1385697D@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).