[gcc r13-7512] libstdc++: Disable embedded tzdata for all 16-bit targets

[gcc r13-7512] libstdc++: Disable embedded tzdata for all 16-bit targets

[Jonathan Wakely]

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

commit r13-7512-gfa78e9a672af8d36ba455f334824b2262a9517ae
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue May 16 15:08:02 2023 +0100

    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.
    
    (cherry picked from commit 51cf0b3949b88b5e622872e4dac019ceb27400e1)

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

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index af978e3f50c..6f2c4374048 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5201,12 +5201,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 776c6b7ba58..95b8a8de649 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71557,12 +71557,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