diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-05-16 15:08:02 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-05-31 13:17:45 +0100 |
| commit | 51cf0b3949b88b5e622872e4dac019ceb27400e1 (patch) | |
| tree | 5de0f7f7e9c98935fe07b7e8d2453131b4a51e45 /libstdc++-v3 | |
| parent | 7037e7b6e4ac41e536bdb9a2efcf546ec4d77166 (diff) | |
| download | gcc-51cf0b3949b88b5e622872e4dac019ceb27400e1.zip gcc-51cf0b3949b88b5e622872e4dac019ceb27400e1.tar.gz gcc-51cf0b3949b88b5e622872e4dac019ceb27400e1.tar.bz2 | |
libstdc++: Disable embedded tzdata for all 16-bit targets
libstdc++-v3/ChangeLog:
* acinclude.m4 (GLIBCXX_ZONEINFO_DIR): Extend logic for avr and
msp430 to all 16-bit targets.
* configure: Regenerate.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 15 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 18 |
2 files changed, 21 insertions, 12 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 8129373..eb30c4f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -5426,12 +5426,15 @@ AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [ zoneinfo_dir=none ;; esac - case "$host" in - avr-*-* | msp430-*-* ) embed_zoneinfo=no ;; - *) - # Also embed a copy of the tzdata.zi file as a static string. - embed_zoneinfo=yes ;; - esac + + AC_COMPUTE_INT(glibcxx_cv_at_least_32bit, [sizeof(void*) >= 4]) + 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 + else + # The embedded data is too large for 16-bit targets. + embed_zoneinfo=no + fi elif test "x${with_libstdcxx_zoneinfo}" = xno; then # Disable tzdb support completely. zoneinfo_dir=none diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 412c4bf..167aabd 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -71903,12 +71903,18 @@ fi zoneinfo_dir=none ;; esac - case "$host" in - avr-*-* | msp430-*-* ) embed_zoneinfo=no ;; - *) - # Also embed a copy of the tzdata.zi file as a static string. - embed_zoneinfo=yes ;; - esac + + if ac_fn_c_compute_int "$LINENO" "sizeof(void*) >= 4" "glibcxx_cv_at_least_32bit" ""; then : + +fi + + 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 + else + # The embedded data is too large for 16-bit targets. + embed_zoneinfo=no + fi elif test "x${with_libstdcxx_zoneinfo}" = xno; then # Disable tzdb support completely. zoneinfo_dir=none |