diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-05-31 19:05:32 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-05-31 20:57:30 +0100 |
| commit | 2a919c08abb2cc5aeb31abb400b3489f67467dbf (patch) | |
| tree | 3e890d326da4855dafeb8f86a1fddb7c329ae4ac | |
| parent | 994195b597ff20a39da9a815ce0722d8f808f4a0 (diff) | |
| download | gcc-2a919c08abb2cc5aeb31abb400b3489f67467dbf.zip gcc-2a919c08abb2cc5aeb31abb400b3489f67467dbf.tar.gz gcc-2a919c08abb2cc5aeb31abb400b3489f67467dbf.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index eb30c4f..ca77697 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 4db8a28..f573dfc 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 |