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

5c38cb23 · doko@ubuntu.com · af0628e0 · 5c38cb23 · 5c38cb23 · 5c38cb23
Kaydet (Commit) 5c38cb23 authored Eyl 01, 2016 tarafından doko@ubuntu.com
Hide whitespace changes
Inline Side-by-side

Showing with 52 additions and 2 deletions

NEWS Misc/NEWS +2 -0

configure configure +25 -1

configure.ac configure.ac +25 -1

No files found.
--- 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.


--- 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__)

--- 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__)