[PATCH] config.guess: Update Haiku guesses; add test suites

[Alexander von Gluck IV]

---
 config.guess                | 7 +++++--
 testsuite/config-guess.data | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config.guess b/config.guess
index 160ecf0..74207aa 100755
--- a/config.guess
+++ b/config.guess
@@ -1378,8 +1378,11 @@ EOF
     BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
        GUESS=i586-pc-haiku
        ;;
-    x86_64:Haiku:*:*)
-       GUESS=x86_64-unknown-haiku
+    ppc:Haiku:*:*)     # Haiku running on Apple PowerPC
+       GUESS=powerpc-apple-haiku
+       ;;
+    *:Haiku:*:*)       # Haiku modern gcc (not bound by BeOS compat)
+       GUESS=$UNAME_MACHINE-unknown-haiku
        ;;
     SX-4:SUPER-UX:*:*)
        GUESS=sx4-nec-superux$UNAME_RELEASE
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 7065a41..1e484c3 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -25,6 +25,7 @@ SX-8 | 1.0 | SUPER-UX | ignored | ignored | sx8-nec-superux1.0
 SX-8R | 1.0 | SUPER-UX | ignored | ignored | sx8r-nec-superux1.0
 SX-ACE | 1.0 | SUPER-UX | ignored | ignored | sxace-nec-superux1.0
 aarch64 | ignored | Linux | ignored | ignored | aarch64-unknown-linux-gnu
+aarch64 | ignored | Haiku | ignored | ignored | aarch64-unknown-haiku
 aarch64_be | ignored | Linux | ignored | ignored | aarch64_be-unknown-linux-gnu
 amd64 | 1.5.12(0.116/4/2) | CYGWIN_NT-5.2 | ignored | ignored | 
x86_64-pc-cygwin
 amd64 | 6.1.4 | NetBSD | ignored | x86_64 | x86_64-unknown-netbsd6.1
@@ -40,6 +41,7 @@ arceb | ignored | Linux | ignored | ignored | 
arceb-unknown-linux-gnu
 arm | 12.0 | FreeBSD | ignored | armv6 | armv6-unknown-freebsd12.0-gnueabihf
 arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabihf
 arm | 12.1 | AROS | ignored | armv7 | arm-unknown-aros
+arm | ignored | Haiku | ignored | ignored | arm-unknown-haiku
 arm | ignored | Linux | ignored | ignored | arm-unknown-linux-gnueabihf
 arm | ignored | RISCOS | ignored | ignored | arm-unknown-riscos
 arm | ignored | riscos | ignored | ignored | arm-unknown-riscos
@@ -106,12 +108,14 @@ padre | 2.6.15 | Linux | ignored | ignored | 
sparc-unknown-linux-gnu
 pc | 1.0 | ignored | ignored | ignored | i586-pc-msdosdjgpp
 powerpc | 14.0 | Darwin | ignored | powerpc | powerpc-apple-darwin14.0
 ppc | 2.6.9-22 | Linux | ignored | ignored | powerpc-unknown-linux-gnu
+ppc | ignored | Haiku | ignored | ignored | powerpc-apple-haiku
 ppc64 | 2.6.9-22 | Linux | ignored | ignored | powerpc64-unknown-linux-gnu
 ppc64le | 3.1.0 | Linux | ignored | ignored | powerpc64le-unknown-linux-gnu
 riscv | 1.0 | Twizzler | ignored | ignored | riscv-unknown-twizzler
 riscv32 | ignored | Linux | ignored | ignored | riscv32-unknown-linux-gnu
 riscv32be | ignored | Linux | ignored | ignored | riscv32be-unknown-linux-gnu
 riscv64 | ignored | Linux | ignored | ignored | riscv64-unknown-linux-gnu
+riscv64 | ignored | Haiku | ignored | ignored | riscv64-unknown-haiku
 riscv64be | ignored | Linux | ignored | ignored | riscv64be-unknown-linux-gnu
 s390x | 5.6 | SunOS | ignored | ignored | s390x-ibm-solaris2.6
 sun3 | 4.0 | SunOS | ignored | ignored | m68k-sun-sunos4.0
-- 
2.36.0