From 240e8683845faf098da8bee111dc38181a7bdb15 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 24 Aug 2023 22:37:20 +0200
Subject: [PATCH] [3.12] gh-108447: Detect platform triplets for x86_64
 GNU/Hurd (GH-108045)

(cherry picked from commit edb569e8e1f469ac5ce629cc647ab169d895de41)
---
 .../Build/2023-08-24-18-36-31.gh-issue-108447.Ofsygr.rst    | 1 +
 configure                                                   | 6 ++++++
 configure.ac                                                | 6 ++++++
 3 files changed, 13 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Build/2023-08-24-18-36-31.gh-issue-108447.Ofsygr.rst

diff --git a/Misc/NEWS.d/next/Build/2023-08-24-18-36-31.gh-issue-108447.Ofsygr.rst b/Misc/NEWS.d/next/Build/2023-08-24-18-36-31.gh-issue-108447.Ofsygr.rst
new file mode 100644
index 00000000000000..a695ef503e406e
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-08-24-18-36-31.gh-issue-108447.Ofsygr.rst
@@ -0,0 +1 @@
+Fix x86_64 GNU/Hurd build
diff --git a/configure b/configure
index 7c3250729c89d3..3aa70d07cf7e2f 100755
--- a/configure
+++ b/configure
@@ -6899,7 +6899,13 @@ cat > conftest.c <<EOF
 #   error unknown platform triplet
 # endif
 #elif defined(__gnu_hurd__)
+# if defined(__x86_64__) && defined(__LP64__)
+        x86_64-gnu
+# elif defined(__i386__)
         i386-gnu
+# else
+#   error unknown platform triplet
+# endif
 #elif defined(__APPLE__)
         darwin
 #elif defined(__VXWORKS__)
diff --git a/configure.ac b/configure.ac
index 3afa9aca8bbd43..8b7a3d7934422f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1078,7 +1078,13 @@ cat > conftest.c <<EOF
 #   error unknown platform triplet
 # endif
 #elif defined(__gnu_hurd__)
+# if defined(__x86_64__) && defined(__LP64__)
+        x86_64-gnu
+# elif defined(__i386__)
         i386-gnu
+# else
+#   error unknown platform triplet
+# endif
 #elif defined(__APPLE__)
         darwin
 #elif defined(__VXWORKS__)