From: Thomas Schwinge <tschwinge@baylibre.com>
Date: Sat, 16 Mar 2024 23:06:54 +0000 (+0100)
Subject: Merge commit 'db50aea62595452db12565186cb520728540d987' into HEAD
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9e0719ea7605e54096c42af4a0b2a6fcfc81b0;p=thirdparty%2Fgcc.git

Merge commit 'db50aea62595452db12565186cb520728540d987' into HEAD
---

0a9e0719ea7605e54096c42af4a0b2a6fcfc81b0
diff --cc .gitignore
index b1c6625d645c,93a16b0b950c..1b2ecabbfe7e
--- a/.gitignore
+++ b/.gitignore
@@@ -69,11 -69,4 +69,12 @@@ stamp-
  /mpc*
  /gmp*
  /isl*
+ /gettext*
 +
 +# ADDITIONS from GCCRS front-end
 +.vscode/*
 +test.code-workspace
 +
 +gcc/rust/test3-tiny/*
 +.clang-format.swap
 +libgrust/*/target/
diff --cc Makefile.def
index fbc15cfc79d9,792f81447e1b..0e2d7869a3ab
--- a/Makefile.def
+++ b/Makefile.def
@@@ -359,8 -363,7 +365,8 @@@ dependencies = { module=configure-gcc; 
  dependencies = { module=configure-gcc; on=all-gold; };
  dependencies = { module=configure-gcc; on=all-libiconv; };
  dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
 +dependencies = { module=all-gcc; on=all-libgrust; };
- dependencies = { module=all-gcc; on=all-intl; };
+ dependencies = { module=all-gcc; on=all-gettext; };
  dependencies = { module=all-gcc; on=all-mpfr; };
  dependencies = { module=all-gcc; on=all-mpc; };
  dependencies = { module=all-gcc; on=all-isl; };
diff --cc Makefile.in
index bcd46394af52,b65ab4953bce..46d310630bf7
--- a/Makefile.in
+++ b/Makefile.in
@@@ -67688,26 -65916,16 +67690,26 @@@ all-stagetrain-gcc: all-stagetrain-libi
  all-stagefeedback-gcc: all-stagefeedback-libiberty
  all-stageautoprofile-gcc: all-stageautoprofile-libiberty
  all-stageautofeedback-gcc: all-stageautofeedback-libiberty
 +all-gcc: maybe-all-libgrust
 +all-stage1-gcc: maybe-all-stage1-libgrust
 +all-stage2-gcc: maybe-all-stage2-libgrust
 +all-stage3-gcc: maybe-all-stage3-libgrust
 +all-stage4-gcc: maybe-all-stage4-libgrust
 +all-stageprofile-gcc: maybe-all-stageprofile-libgrust
 +all-stagetrain-gcc: maybe-all-stagetrain-libgrust
 +all-stagefeedback-gcc: maybe-all-stagefeedback-libgrust
 +all-stageautoprofile-gcc: maybe-all-stageautoprofile-libgrust
 +all-stageautofeedback-gcc: maybe-all-stageautofeedback-libgrust
- all-gcc: maybe-all-intl
- all-stage1-gcc: maybe-all-stage1-intl
- all-stage2-gcc: maybe-all-stage2-intl
- all-stage3-gcc: maybe-all-stage3-intl
- all-stage4-gcc: maybe-all-stage4-intl
- all-stageprofile-gcc: maybe-all-stageprofile-intl
- all-stagetrain-gcc: maybe-all-stagetrain-intl
- all-stagefeedback-gcc: maybe-all-stagefeedback-intl
- all-stageautoprofile-gcc: maybe-all-stageautoprofile-intl
- all-stageautofeedback-gcc: maybe-all-stageautofeedback-intl
+ all-gcc: maybe-all-gettext
+ all-stage1-gcc: maybe-all-stage1-gettext
+ all-stage2-gcc: maybe-all-stage2-gettext
+ all-stage3-gcc: maybe-all-stage3-gettext
+ all-stage4-gcc: maybe-all-stage4-gettext
+ all-stageprofile-gcc: maybe-all-stageprofile-gettext
+ all-stagetrain-gcc: maybe-all-stagetrain-gettext
+ all-stagefeedback-gcc: maybe-all-stagefeedback-gettext
+ all-stageautoprofile-gcc: maybe-all-stageautoprofile-gettext
+ all-stageautofeedback-gcc: maybe-all-stageautofeedback-gettext
  all-gcc: maybe-all-mpfr
  all-stage1-gcc: maybe-all-stage1-mpfr
  all-stage2-gcc: maybe-all-stage2-mpfr
diff --cc configure
index 55b1252a0305,f8abb26b4711..0ed26583b061
--- a/configure
+++ b/configure
@@@ -2829,7 -2829,7 +2829,7 @@@ build_tools="build-texinfo build-flex b
  
  # these libraries are used by various programs built for the host environment
  #f
- host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe libgrust "
 -host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe"
++host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe libgrust "
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
diff --cc configure.ac
index 03abcc6582bc,d5490982542a..dd9389ae2591
--- a/configure.ac
+++ b/configure.ac
@@@ -133,7 -133,7 +133,7 @@@ build_tools="build-texinfo build-flex b
  
  # these libraries are used by various programs built for the host environment
  #f
- host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe libgrust "
 -host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe"
++host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe libgrust "
  
  # these tools are built for the host environment
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to