re: toolchain/58409: tools/mpfr fails to build on a Solaris 11.4 host system configured as a secondary logical domain - tools/gmp incorrectly configured

[Palle Lyckegaard <palle%lyckegaard.dk@localhost>]

On Thu, 11 Jul 2024, matthew green wrote:

> -       if grep 'SUNW,UltraSPARC-T5' $dummy >/dev/null; then
> +       if egrep '(SUNW|ORCL),(Ultra)?SPARC-T5' $dummy >/dev/null; then
>
> for a bunch of cases.  is that sufficient for you?

Yes - I picked the following single-line change change from the gmp 6.3.0 
release with success.

I feel tempted to commit this small fix for now until our gmp in-tree is 
updated.

diff --git a/external/lgpl3/gmp/dist/config.guess 
b/external/lgpl3/gmp/dist/config.guess
index e69f197a487e..7209606b0ffe 100755
--- a/external/lgpl3/gmp/dist/config.guess
+++ b/external/lgpl3/gmp/dist/config.guess
@@ -705,7 +705,7 @@ sparc-*-* | sparc64-*-*)
          exact_cpu=ultrasparc2i
        elif grep 'SUNW,UltraSPARC-II' $dummy >/dev/null; then
          exact_cpu=ultrasparc2
-       elif grep 'SUNW,UltraSPARC' $dummy >/dev/null; then
+       elif egrep '(SUNW|ORCL),(Ultra)?SPARC' $dummy >/dev/null; then
          exact_cpu=ultrasparc
        elif grep 'Ross,RT62.' $dummy >/dev/null; then
          # RT620, RT625, RT626 hypersparcs (v8).