From 20044c0bf7ad5f2e32eca6ef6bacb993126d6c01 Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 16 Feb 2022 21:24:12 +1300
Subject: bionic: mark bionic/android-ndk as obsolete

Support for bionic was dropped by GCC some time ago. There are patches
for older GCC versions but those are difficult to maintain and the
version of the android-ndk they support is of little use. Mark all of
the existing bionic support as obsolete so it can be removed after the
next release.

Signed-off-by: Chris Packham <judge.packham@gmail.com>

diff --git a/config/libc/bionic.in b/config/libc/bionic.in
index a5b150e..b8b889c 100644
--- a/config/libc/bionic.in
+++ b/config/libc/bionic.in
@@ -5,6 +5,7 @@
 ## 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
diff --git a/packages/android-ndk/package.desc b/packages/android-ndk/package.desc
index 8811b3c..ef1d14d 100644
--- a/packages/android-ndk/package.desc
+++ b/packages/android-ndk/package.desc
@@ -3,3 +3,4 @@ mirrors='https://dl.google.com/android/repository'
 relevantpattern='r*|[a-z]'
 archive_filename='@{pkg_name}-@{version}-linux-x86_64'
 archive_formats='.zip'
+obsolete='yes'
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index c78a1f6..51c2490 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,4 +1,5 @@
 CT_CONFIG_VERSION="4"
+CT_OBSOLETE=y
 CT_EXPERIMENTAL=y
 CT_ARCH_ARM=y
 CT_ARCH_64=y
-- 
cgit v0.10.2-6-g49f6