[committed] libstdc++: Do not embed tzdata.zi for 8-bit and 16-bit targets

Message ID 20230201210755.2445205-1-jwakely@redhat.com
State Committed
Headers
Series [committed] libstdc++: Do not embed tzdata.zi for 8-bit and 16-bit targets |

Commit Message

Jonathan Wakely Feb. 1, 2023, 9:07 p.m. UTC
  The embedded tzdata.zi causes new build failures for small targets.

Tested x86_64-linux, built on avr and msp430-elf.

-- >8 --

The string literal containing the static tzdata.zi information is too
large for some targets, so do not enable it by default for avr-*-* and
msp430-*-*.

libstdc++-v3/ChangeLog:

	* acinclude.m4 (GLIBCXX_ZONEINFO_DIR) [avr-*-*, msp430-*-*]: Set
	embed_zoneinfo=no
	* configure: Regenerate.
---
 libstdc++-v3/acinclude.m4 | 8 ++++++--
 libstdc++-v3/configure    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)
  

Patch

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 982e979a840..5136c0571e8 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -5201,8 +5201,12 @@  AC_DEFUN([GLIBCXX_ZONEINFO_DIR], [
 	zoneinfo_dir=none
 	;;
     esac
-    # Also embed a copy of the tzdata.zi file as a static string.
-    embed_zoneinfo=yes
+    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
   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 a298cbd45a0..68ee94c9e28 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71557,8 +71557,12 @@  fi
 	zoneinfo_dir=none
 	;;
     esac
-    # Also embed a copy of the tzdata.zi file as a static string.
-    embed_zoneinfo=yes
+    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
   elif test "x${with_libstdcxx_zoneinfo}" = xno; then
     # Disable tzdb support completely.
     zoneinfo_dir=none