Fix architecture detection on GNU/Hurd.

On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized.
Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess,
so the architecture can be identified and the proper atomic primitives used.

Merge-request: 638
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/configure b/configure
index f2023b818d..0111f511b6 100755
--- a/configure
+++ b/configure
@@ -2755,6 +2755,17 @@ fi
 
 if [ -z "${CFG_HOST_ARCH}" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+    GNU:*:*)
+        CFG_HOST_ARCH=`echo ${UNAME_MACHINE} | sed -e 's,[-/].*$,,'`
+        case "$CFG_HOST_ARCH" in
+            i?86)
+                CFG_HOST_ARCH=i386
+                ;;
+        esac
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    GNU/Hurd ($CFG_HOST_ARCH)"
+        fi
+        ;;
     IRIX*:*:*)
         CFG_HOST_ARCH=`uname -p`
         if [ "$OPT_VERBOSE" = "yes" ]; then