[prev in list] [next in list] [prev in thread] [next in thread]
List: gcc-patches
Subject: [committed] libstdc++: Fix configure test for 32-bit targets
From: Jonathan Wakely via Gcc-patches <gcc-patches () gcc ! gnu ! org>
Date: 2023-05-31 20:02:57
Message-ID: 20230531200257.6784-1-jwakely () redhat ! com
[Download RAW message or body]
Tested x86_64-linux. Built msp430-elf and cris-elf. Pushed to trunk.
-- >8 --
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.
---
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 eb30c4f00a5..ca776974832 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5427,7 +5427,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 4db8a284083..f573dfced2e 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71904,7 +71904,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
--
2.40.1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic