changeset:   102989:a931fdc4c4c4
user:        doko@ubuntu.com
date:        Thu Sep 01 22:05:20 2016 +0200
files:       Misc/NEWS configure configure.ac
description:
- Issue #27917: Set platform triplets for Android builds.


diff -r 96e05f1af2c8 -r a931fdc4c4c4 Misc/NEWS
--- a/Misc/NEWS	Thu Sep 01 22:21:05 2016 +0300
+++ b/Misc/NEWS	Thu Sep 01 22:05:20 2016 +0200
@@ -127,6 +127,8 @@
 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 -r 96e05f1af2c8 -r a931fdc4c4c4 configure
--- a/configure	Thu Sep 01 22:21:05 2016 +0300
+++ b/configure	Thu Sep 01 22:05:20 2016 +0200
@@ -5279,7 +5279,31 @@
 #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 -r 96e05f1af2c8 -r a931fdc4c4c4 configure.ac
--- a/configure.ac	Thu Sep 01 22:21:05 2016 +0300
+++ b/configure.ac	Thu Sep 01 22:05:20 2016 +0200
@@ -768,7 +768,31 @@
 #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__)