From 0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838 Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Wed, 15 Mar 2023 17:40:37 +0100 Subject: android-tools: remove recipe and dynamic-layer The recipe has been patched to remove the clang dependency and moved to meta-openembedded at https://github.com/openembedded/meta-openembedded/tree/master/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools Signed-off-by: Etienne Cordonnier --- .../20150704-CVE-2015-3239_dwarf_i.h.patch | 14 ------------ .../legacy_built-in_sync_functions.patch | 25 ---------------------- .../android-tools/libunwind-debian/series | 3 --- .../libunwind-debian/user_pt_regs.patch | 23 -------------------- 4 files changed, 65 deletions(-) delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch (limited to 'dynamic-layers/selinux/android-tools/android-tools/libunwind-debian') diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch deleted file mode 100644 index cc1a8cb..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/20150704-CVE-2015-3239_dwarf_i.h.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fixes "20150704-CVE-2015-3239" -Index: pkg-libunwind/include/dwarf_i.h -=================================================================== ---- pkg-libunwind.orig/include/dwarf_i.h 2015-07-04 10:57:29.000000000 +0900 -+++ pkg-libunwind/include/dwarf_i.h 2015-07-04 11:06:08.675616821 +0900 -@@ -20,7 +20,7 @@ - extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH]; - /* REG is evaluated multiple times; it better be side-effects free! */ - # define dwarf_to_unw_regnum(reg) \ -- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) -+ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) - #endif - - #ifdef UNW_LOCAL_ONLY diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch deleted file mode 100644 index 8d78faa..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/legacy_built-in_sync_functions.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Replace the legacy __sync built-in functions with __atomic ones - libunwind uses the built-in __sync_* functions which are deprecated by GCC and - should be replaced by __atomic_* ones. See the official manuals [1]. - . - The legacy __sync functions do not require to specify the memory order but - __atomic ones do, so we choose the strongest one: __ATOMIC_SEQ_CST. - . - We do this because __sync_fetch_and_add() is not supported on armel. - . - [1]: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html -Author: Kai-Chung Yan () -Last-Update: 2016-10-04 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -155,8 +155,8 @@ - u.vp = addr; - return __sync_bool_compare_and_swap(u.vlp, (long) old, (long) new); - } --# define fetch_and_add1(_ptr) __sync_fetch_and_add(_ptr, 1) --# define fetch_and_add(_ptr, value) __sync_fetch_and_add(_ptr, value) -+# define fetch_and_add1(_ptr) __atomic_fetch_add(_ptr, 1, __ATOMIC_SEQ_CST) -+# define fetch_and_add(_ptr, value) __atomic_fetch_add(_ptr, value, __ATOMIC_SEQ_CST) - # define HAVE_CMPXCHG - # define HAVE_FETCH_AND_ADD - #endif diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series deleted file mode 100644 index 9cac341..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/series +++ /dev/null @@ -1,3 +0,0 @@ -user_pt_regs.patch -legacy_built-in_sync_functions.patch -20150704-CVE-2015-3239_dwarf_i.h.patch diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch deleted file mode 100644 index 8051b6d..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind-debian/user_pt_regs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Kai-Chung Yan -Last-Update: 2016-08-24 -Description: Manual definition of struct user_pt_regs - On ARM64, libunwind uses struct user_pt_regs which is not defined in - anywhere, which causes FTBFS. ---- a/src/ptrace/_UPT_access_reg.c -+++ b/src/ptrace/_UPT_access_reg.c -@@ -26,6 +26,15 @@ - - #include "_UPT_internal.h" - -+#if defined(__aarch64__) -+ struct user_pt_regs { -+ __u64 regs[31]; -+ __u64 sp; -+ __u64 pc; -+ __u64 pstate; -+ }; -+#endif -+ - #if UNW_TARGET_IA64 - # include - # ifdef HAVE_ASM_PTRACE_OFFSETS_H -- cgit v1.2.3-54-g00ecf