- Issue #27917: Set platform triplets for Android builds.

diff --git a/Misc/NEWS b/Misc/NEWS
index 4f66ee222b0f85955b12d89b7f4c87dc284ce615..85772c6bf12a2b0eaf17a63fe28de169ccddb2c6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,8 @@ Tests
 Build
 -----
 
+- Issue #27917: Set platform triplets for Android builds.
+
 - Issue #25825: Update references to the $(LIBPL) installation path on AIX.
   This path was changed in 3.2a4.
 

diff --git a/configure b/configure
index 22eb6387fda546d872e60f8eef4aa40694768fb9..01dd2535de9cd76e34fb9af697ae6c798f060557 100755 (executable)
--- a/configure
+++ b/configure
@@ -5279,7 +5279,31 @@ cat >> conftest.c <<EOF
 #undef powerpc
 #undef sparc
 #undef unix
-#if defined(__linux__)
+#if defined(__ANDROID__)
+# if defined(__x86_64__) && defined(__LP64__)
+        x86_64-linux-android
+# elif defined(__i386__)
+        i686-linux-android
+# elif defined(__aarch64__) && defined(__AARCH64EL__)
+#  if defined(__ILP32__)
+        aarch64_ilp32-linux-android
+#  else
+        aarch64-linux-android
+#  endif
+# elif defined(__ARM_EABI__) && defined(__ARMEL__)
+        arm-linux-androideabi
+# elif defined(__mips_hard_float) && defined(_MIPSEL)
+#  if _MIPS_SIM == _ABIO32
+        mipsel-linux-android
+#  elif _MIPS_SIM == _ABI64
+        mips64el-linux-android
+#  else
+#   error unknown platform triplet
+#  endif
+# else
+#   error unknown platform triplet
+# endif
+#elif defined(__linux__)
 # if defined(__x86_64__) && defined(__LP64__)
         x86_64-linux-gnu
 # elif defined(__x86_64__) && defined(__ILP32__)

diff --git a/configure.ac b/configure.ac
index f68069dd4fd382db70f9ab3e2916f162b92902b7..56fd29cdb9ccac39b4ea8213efe1d8fb82384322 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -768,7 +768,31 @@ cat >> conftest.c <<EOF
 #undef powerpc
 #undef sparc
 #undef unix
-#if defined(__linux__)
+#if defined(__ANDROID__)
+# if defined(__x86_64__) && defined(__LP64__)
+        x86_64-linux-android
+# elif defined(__i386__)
+        i686-linux-android
+# elif defined(__aarch64__) && defined(__AARCH64EL__)
+#  if defined(__ILP32__)
+        aarch64_ilp32-linux-android
+#  else
+        aarch64-linux-android
+#  endif
+# elif defined(__ARM_EABI__) && defined(__ARMEL__)
+        arm-linux-androideabi
+# elif defined(__mips_hard_float) && defined(_MIPSEL)
+#  if _MIPS_SIM == _ABIO32
+        mipsel-linux-android
+#  elif _MIPS_SIM == _ABI64
+        mips64el-linux-android
+#  else
+#   error unknown platform triplet
+#  endif
+# else
+#   error unknown platform triplet
+# endif
+#elif defined(__linux__)
 # if defined(__x86_64__) && defined(__LP64__)
         x86_64-linux-gnu
 # elif defined(__x86_64__) && defined(__ILP32__)