Merge pull request #717 from stilor/merge-bionic

Merge bionic

6 files changed, 193 insertions, 0 deletions

diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index c147f05..963cb2a 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -94,6 +94,7 @@ config CC_GCC_SYSTEM_ZLIB
 config CC_GCC_CONFIG_TLS
     tristate
     prompt "Configure TLS (Thread Local Storage)"
+    depends on !LIBC_bionic
     default m
     help
       Specify that the target supports TLS (Thread Local Storage). Usually
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 170a694..f9e727b 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -1,6 +1,7 @@
 # D.U.M.A. - Detect Unintended Memory Access - Memory checker
 
 ## depends on ! BARE_METAL
+## depends on ! LIBC_bionic
 
 ## help D.U.M.A. - Detect Unintended Memory Access
 ## help A memory bound checker, with additional features.
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index e856b5d..faee8c3 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -4,6 +4,7 @@ config GDB_NATIVE
     bool
     prompt "Native gdb"
     depends on ! BARE_METAL
+    depends on ! LIBC_bionic
     select EXPAT_TARGET
     select NCURSES_TARGET
     help
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 4c62676..fab6b81 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -1,6 +1,7 @@
 # ltrace
 
 ## select LIBELF_TARGET
+## depends on ! LIBC_bionic
 ##
 ## help ltrace is a program that simply runs the specified command until it exits.
 ## help It intercepts and records the dynamic library calls which are called by
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 38dd96f..e77702b 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -1,5 +1,7 @@
 # strace
 
+## depends on ! LIBC_bionic
+
 choice
     bool
     prompt "strace version"
diff --git a/config/libc/bionic.in b/config/libc/bionic.in
new file mode 100644
index 0000000..9e04130
--- /dev/null
+++ b/config/libc/bionic.in
@@ -0,0 +1,187 @@
+# bionic options
+
+## depends on ! WINDOWS && ! BARE_METAL
+## depends on ARCH_arm || ARCH_mips || ARCH_x86
+## depends on EXPERIMENTAL
+## depends on CC_GCC_6_or_later
+##
+## select LIBC_SUPPORT_THREADS_POSIX
+##
+## help Bionic is the Android C library. It is prebuilt, extracted from the Android NDK.
+## help This platform has no TLS (Thread Local Storage) support so that option must be
+## help disabled in the Compiler options.
+
+config THREADS
+    default "posix"
+
+config LIBC_BIONIC_CUSTOM
+    bool
+    prompt "Custom bionic"
+    help
+      The chosen bionic-libc version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_BIONIC_CUSTOM
+
+config LIBC_BIONIC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom bionic source"
+    help
+      Enter the path to the directory or tarball of your source for bionic.
+
+      If the path is a zip archive, it should extract to: <name>-<version>/
+      where the name is android-ndk, and the version is set
+      below in the custom version string.
+
+config LIBC_BIONIC_CUSTOM_VERSION
+    string
+    prompt "Custom BIONIC version"
+    help
+      Enter the version number for your custom bionic.
+
+config LIBC_VERSION
+    string
+    default LIBC_BIONIC_CUSTOM_VERSION
+
+endif # LIBC_BIONIC_CUSTOM
+
+if ! LIBC_BIONIC_CUSTOM
+
+choice
+    bool
+    prompt "bionic version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBC_BIONIC_V_15beta1
+    bool
+    prompt "15beta1"
+
+config LIBC_BIONIC_V_14b
+    bool
+    prompt "14b"
+
+config LIBC_BIONIC_V_13b
+    bool
+    prompt "13b (OBSOLETE)"
+    depends on OBSOLETE
+
+config LIBC_BIONIC_V_12b
+    bool
+    prompt "12b (OBSOLETE)"
+    depends on OBSOLETE
+
+config LIBC_BIONIC_V_11c
+    bool
+    prompt "11c (OBSOLETE)"
+    depends on OBSOLETE
+
+config LIBC_BIONIC_V_10e
+    bool
+    prompt "10e (OBSOLETE)"
+    depends on OBSOLETE
+
+endchoice
+
+config LIBC_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "r15-beta1" if LIBC_BIONIC_V_15beta1
+    default "r14b" if LIBC_BIONIC_V_14b
+    default "r13b" if LIBC_BIONIC_V_13b
+    default "r12b" if LIBC_BIONIC_V_12b
+    default "r11c" if LIBC_BIONIC_V_11c
+    default "r10e" if LIBC_BIONIC_V_10e
+
+endif # ! LIBC_BIONIC_CUSTOM
+
+choice 
+    bool
+    prompt "Android API level"
+    help
+      The minimum for 64 bit support is 21.
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config ANDROID_API_24
+    bool
+    prompt "24"
+
+config ANDROID_API_23
+    bool
+    prompt "23"
+
+config ANDROID_API_22
+    bool
+    prompt "22"
+
+config ANDROID_API_21
+    bool
+    prompt "21"
+
+config ANDROID_API_19
+    bool
+    prompt "19"
+    depends on ARCH_32
+
+config ANDROID_API_18
+    bool
+    prompt "18"
+    depends on ARCH_32
+
+config ANDROID_API_17
+    bool
+    prompt "17"
+    depends on ARCH_32
+
+config ANDROID_API_16
+    bool
+    prompt "16"
+    depends on ARCH_32
+
+config ANDROID_API_15
+    bool
+    prompt "15"
+    depends on ARCH_32
+
+config ANDROID_API_14
+    bool
+    prompt "14"
+    depends on ARCH_32
+
+config ANDROID_API_13
+    bool
+    prompt "13"
+    depends on ARCH_32
+
+config ANDROID_API_12
+    bool
+    prompt "12"
+    depends on ARCH_32
+
+config ANDROID_API_9
+    bool
+    prompt "9"
+    depends on ARCH_32
+
+endchoice
+
+config ANDROID_API
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "24" if ANDROID_API_24
+    default "23" if ANDROID_API_23
+    default "22" if ANDROID_API_22
+    default "21" if ANDROID_API_21
+    default "19" if ANDROID_API_19
+    default "18" if ANDROID_API_18
+    default "17" if ANDROID_API_17
+    default "16" if ANDROID_API_16
+    default "15" if ANDROID_API_15
+    default "14" if ANDROID_API_14
+    default "13" if ANDROID_API_13
+    default "12" if ANDROID_API_12
+    default "9" if ANDROID_API_9
+