Merge commit 'db50aea62595452db12565186cb520728540d987' into HEAD

diff --cc .gitignore
index b1c6625d645cd5f007b0765e125d6725a911e096,93a16b0b950c98bd53e0fd3a51616bed5503ceb5..1b2ecabbfe7ebb878ec0ae987ad33a66a7cc4cf8
--- 1/.gitignore
--- 2/.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 fbc15cfc79d968bdbb40a5ef288343e226a94caa,792f81447e1b1fd05767a6c5e596fadbb44d9316..0e2d7869a3abd3f6fcd7484270787f6ca4c63519
--- 1/Makefile.def
--- 2/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-intl; };
 +dependencies = { module=all-gcc; on=all-libgrust; };
+ 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 bcd46394af522c3b69993a9c9ac40a47d20f9aaa,b65ab4953bce431d2f1fd067b50cf4cd963d4086..46d310630bf72913a31fabe01a082613ec50987c
--- 1/Makefile.in
--- 2/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-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-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-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 55b1252a03056c8b01dac20e33b3e09149fb2c4b,f8abb26b4711d8964d8069f98bb7265b8c20fb23..0ed26583b0611f73da98502adce22d9adb7b2ed6
--- 1/configure
--- 2/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 03abcc6582bc050204d262ede08b12e5c8e20e61,d5490982542aba38bfe382fd7dff0394ba7946e6..dd9389ae259185f4e4797f81172a0dc4c7027026
--- 1/configure.ac
--- 2/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