mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-20 21:33:08 +00:00
Remove obsolete bionic/android support
The bionic libc support was out of date and relied on downloading binaries from the internet. It was already marked as obsolete. Now that the 1.25.0 release is out it can be completely removed. Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham
parent
e8c4d97683
commit
53bbdc7425
@ -1,7 +1,6 @@
|
|||||||
# D.U.M.A. - Detect Unintended Memory Access - Memory checker
|
# D.U.M.A. - Detect Unintended Memory Access - Memory checker
|
||||||
|
|
||||||
## depends on ! BARE_METAL
|
## depends on ! BARE_METAL
|
||||||
## depends on ! LIBC_BIONIC
|
|
||||||
|
|
||||||
## help D.U.M.A. - Detect Unintended Memory Access
|
## help D.U.M.A. - Detect Unintended Memory Access
|
||||||
## help A memory bound checker, with additional features.
|
## help A memory bound checker, with additional features.
|
||||||
|
|||||||
@ -4,7 +4,6 @@ config GDB_NATIVE
|
|||||||
bool
|
bool
|
||||||
prompt "Native gdb"
|
prompt "Native gdb"
|
||||||
depends on ! BARE_METAL
|
depends on ! BARE_METAL
|
||||||
depends on ! LIBC_BIONIC
|
|
||||||
depends on CC_LANG_CXX || !GDB_8_0_or_later
|
depends on CC_LANG_CXX || !GDB_8_0_or_later
|
||||||
select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later
|
select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later
|
||||||
select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later
|
select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
# ltrace
|
# ltrace
|
||||||
|
|
||||||
## select LIBELF_TARGET
|
## select LIBELF_TARGET
|
||||||
## depends on ! LIBC_BIONIC
|
|
||||||
##
|
##
|
||||||
## help ltrace is a program that simply runs the specified command until it exits.
|
## 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
|
## help It intercepts and records the dynamic library calls which are called by
|
||||||
|
|||||||
@ -1,3 +1 @@
|
|||||||
# strace
|
# strace
|
||||||
|
|
||||||
## depends on ! LIBC_BIONIC
|
|
||||||
|
|||||||
@ -1,127 +0,0 @@
|
|||||||
# bionic options
|
|
||||||
|
|
||||||
|
|
||||||
## package android-ndk
|
|
||||||
## depends on ! WINDOWS && ! BARE_METAL
|
|
||||||
## depends on ARCH_ARM || ARCH_MIPS || ARCH_X86
|
|
||||||
## depends on EXPERIMENTAL
|
|
||||||
## depends on OBSOLETE
|
|
||||||
#
|
|
||||||
# Patches to support bionic were not ported to GCC11 (or to GCC5 and below).
|
|
||||||
## select GCC_REQUIRE_6_or_later
|
|
||||||
## select GCC_REQUIRE_older_than_11
|
|
||||||
#
|
|
||||||
# GDB10 imported a new drop from gnulib, which fails to build against bionic.
|
|
||||||
# Patch to support bionic was ported to 7.12 and newer.
|
|
||||||
## select GDB_REQUIRE_7_12_or_later
|
|
||||||
## select GDB_REQUIRE_older_than_10
|
|
||||||
|
|
||||||
## 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"
|
|
||||||
|
|
||||||
# FIXME does API level depend on the bionic version? generate that, too?
|
|
||||||
choice
|
|
||||||
bool
|
|
||||||
prompt "Android API level"
|
|
||||||
help
|
|
||||||
The minimum for 64 bit support is 21.
|
|
||||||
|
|
||||||
config ANDROID_API_28
|
|
||||||
bool
|
|
||||||
prompt "28"
|
|
||||||
|
|
||||||
config ANDROID_API_27
|
|
||||||
bool
|
|
||||||
prompt "27"
|
|
||||||
|
|
||||||
config ANDROID_API_26
|
|
||||||
bool
|
|
||||||
prompt "26"
|
|
||||||
|
|
||||||
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
|
|
||||||
default "28" if ANDROID_API_28
|
|
||||||
default "27" if ANDROID_API_27
|
|
||||||
default "26" if ANDROID_API_26
|
|
||||||
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
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# We don't support building bionic (yet) so no official repository
|
|
||||||
mirrors='https://dl.google.com/android/repository'
|
|
||||||
relevantpattern='r*|[a-z]'
|
|
||||||
archive_filename='@{pkg_name}-@{version}-linux-x86_64'
|
|
||||||
archive_formats='.zip'
|
|
||||||
obsolete='yes'
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
md5 android-ndk-r14b-linux-x86_64.zip 5509d6cacdfa2311d3cd84f747b7a5f0
|
|
||||||
sha1 android-ndk-r14b-linux-x86_64.zip becd161da6ed9a823e25be5c02955d9cbca1dbeb
|
|
||||||
sha256 android-ndk-r14b-linux-x86_64.zip 0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024
|
|
||||||
sha512 android-ndk-r14b-linux-x86_64.zip 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
md5 android-ndk-r15c-linux-x86_64.zip 9a52de7648f86468ea3ca0f6f08e6c57
|
|
||||||
sha1 android-ndk-r15c-linux-x86_64.zip 0bf02d4e8b85fd770fd7b9b2cdec57f9441f27a2
|
|
||||||
sha256 android-ndk-r15c-linux-x86_64.zip f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c
|
|
||||||
sha512 android-ndk-r15c-linux-x86_64.zip abe7f111ca51d9bb07a9fb6f9f6cc8f0195be056c8d8d996cddf4e7df101d120dab1afce71a1670e4f29f7b6462eb9863fbf7c86dcd9a21b7cb4bcea822cbe4f
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
md5 android-ndk-r16b-linux-x86_64.zip e21a2687c26b71379beecfd8d0525224
|
|
||||||
sha1 android-ndk-r16b-linux-x86_64.zip 42aa43aae89a50d1c66c3f9fdecd676936da6128
|
|
||||||
sha256 android-ndk-r16b-linux-x86_64.zip bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901
|
|
||||||
sha512 android-ndk-r16b-linux-x86_64.zip 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
md5 android-ndk-r17c-linux-x86_64.zip a4b6b8281e7d101efd994d31e64af746
|
|
||||||
sha1 android-ndk-r17c-linux-x86_64.zip 12cacc70c3fd2f40574015631c00f41fb8a39048
|
|
||||||
sha256 android-ndk-r17c-linux-x86_64.zip 3f541adbd0330a9205ba12697f6d04ec90752c53d6b622101a2a8a856e816589
|
|
||||||
sha512 android-ndk-r17c-linux-x86_64.zip b8ad2aae0ea8caa7043c390c94c638c9499db22050c46b5e4f4b005fef6b47b7abdfb76c340c5a7e6024d8e6be926e07ab5556002c02919ba88f8b9469ed831e
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
r18 removed the support for GCC and is therefore useless in
|
|
||||||
crosstool-NG (unless clang is supported).
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
CT_CONFIG_VERSION="4"
|
|
||||||
CT_OBSOLETE=y
|
|
||||||
CT_EXPERIMENTAL=y
|
|
||||||
CT_ARCH_ARM=y
|
|
||||||
CT_ARCH_64=y
|
|
||||||
CT_ARCH_ARCH="armv8-a"
|
|
||||||
CT_STATIC_TOOLCHAIN=y
|
|
||||||
CT_KERNEL_LINUX=y
|
|
||||||
CT_ANDROID_API_21=y
|
|
||||||
CT_CC_LANG_CXX=y
|
|
||||||
CT_DEBUG_GDB=y
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
reporter_name="Howard Chu"
|
|
||||||
reporter_url="http://www.symas.com"
|
|
||||||
reporter_comment="Config to build cross-compiler for Android/bionic on ARM64"
|
|
||||||
@ -18,7 +18,6 @@ CT_DoArchTupleValues() {
|
|||||||
glibc,y) CT_TARGET_SYS=gnueabi;;
|
glibc,y) CT_TARGET_SYS=gnueabi;;
|
||||||
uClibc-ng,y)CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
|
uClibc-ng,y)CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
|
||||||
musl,y) CT_TARGET_SYS=musleabi;;
|
musl,y) CT_TARGET_SYS=musleabi;;
|
||||||
bionic,y) CT_TARGET_SYS=androideabi;;
|
|
||||||
*,y) CT_TARGET_SYS=eabi;;
|
*,y) CT_TARGET_SYS=eabi;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
# This file adds functions to extract the bionic C library from the Android NDK
|
|
||||||
# Copyright 2017 Howard Chu
|
|
||||||
# Licensed under the GPL v2. See COPYING in the root of this package
|
|
||||||
|
|
||||||
# Install Unified headers
|
|
||||||
bionic_headers()
|
|
||||||
{
|
|
||||||
CT_DoStep INFO "Installing C library headers"
|
|
||||||
CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/sysroot/usr" "${CT_SYSROOT_DIR}"
|
|
||||||
}
|
|
||||||
|
|
||||||
bionic_main()
|
|
||||||
{
|
|
||||||
local arch="${CT_ARCH}"
|
|
||||||
if [ "${CT_ARCH_64}" = "y" ]; then
|
|
||||||
if [ "${CT_ARCH}" = "x86" ]; then
|
|
||||||
arch="${arch}_"
|
|
||||||
fi
|
|
||||||
arch="${arch}64"
|
|
||||||
fi
|
|
||||||
CT_DoStep INFO "Installing C library binaries"
|
|
||||||
CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
|
|
||||||
|
|
||||||
# NB: Modifying both CT_TARGET_CFLAGS and CT_ALL_TARGET_CFLAGS: the __ANDROID_API__
|
|
||||||
# definition needs to be passed into GCC build, or the resulting libstdc++ gets
|
|
||||||
# miscompiled (attempt to link against it results in unresolved symbols to stdout/...).
|
|
||||||
# And since __ANDROID_API__ is a user config option, placing it with other user-supplied
|
|
||||||
# options isn't completely out of character.
|
|
||||||
# On the other hand, CT_ALL_TARGET_CFLAGS in non-multilib builds is already set and does
|
|
||||||
# not get recalculated after GCC build, so setting CT_TARGET_CFLAGS is not reflected
|
|
||||||
# on other libraries/apps, such as gdbserver.
|
|
||||||
CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
|
|
||||||
CT_EnvModify CT_ALL_TARGET_CFLAGS "${CT_ALL_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
|
|
||||||
}
|
|
||||||
@ -1134,7 +1134,6 @@ CT_DoBuildTargetTuple()
|
|||||||
glibc) CT_TARGET_SYS=gnu;;
|
glibc) CT_TARGET_SYS=gnu;;
|
||||||
uClibc-ng) CT_TARGET_SYS=uclibc;;
|
uClibc-ng) CT_TARGET_SYS=uclibc;;
|
||||||
musl) CT_TARGET_SYS=musl;;
|
musl) CT_TARGET_SYS=musl;;
|
||||||
bionic) CT_TARGET_SYS=android;;
|
|
||||||
none|newlib|picolibc) CT_TARGET_SYS=elf;;
|
none|newlib|picolibc) CT_TARGET_SYS=elf;;
|
||||||
*)
|
*)
|
||||||
# Keep empty for the libraries like mingw or avr-libc
|
# Keep empty for the libraries like mingw or avr-libc
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user