From 5ad4bd8f267bf17270c4913cc1bd034d7c644ab7 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 10 Oct 2022 13:17:33 +0200 Subject: glibc: clean-up unused recipe Clean-up unused recipe. Signed-off-by: Marcel Ziswiler (cherry picked from commit eeed965025c5abf5a6dd21f0711cc27c554f157b) --- ...don-t-use-optimized-for-VFP-NEON-versions.patch | 132 --------------------- recipes-core/glibc/glibc_2.%.bbappend | 2 - 2 files changed, 134 deletions(-) delete mode 100644 recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch delete mode 100644 recipes-core/glibc/glibc_2.%.bbappend diff --git a/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch b/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch deleted file mode 100644 index dd3c217..0000000 --- a/recipes-core/glibc/glibc-2.22/0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 3cb3db5c200bb0cfdcfdfcd64e385895e47725f8 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Fri, 12 Jun 2015 13:27:55 +0200 -Subject: [PATCH] memcpy: don't use optimized for VFP/NEON versions - -Tests with the tinymembench tool on a Colibri T30 show the performance -of the standard arm based memcpy to be around 2 times faster than -__memcpy_neon or __memcpy_vfp. - -Tests on Apalis iMX6 confirm this, although running only around 1.3 times faster. ---- - sysdeps/arm/armv7/multiarch/Makefile | 3 --- - sysdeps/arm/armv7/multiarch/ifunc-impl-list.c | 20 -------------------- - sysdeps/arm/armv7/multiarch/memcpy.S | 17 ----------------- - sysdeps/arm/armv7/multiarch/memcpy_neon.S | 9 --------- - sysdeps/arm/armv7/multiarch/memcpy_vfp.S | 7 ------- - 5 files changed, 56 deletions(-) - -diff --git a/sysdeps/arm/armv7/multiarch/Makefile b/sysdeps/arm/armv7/multiarch/Makefile -index 9e1e61c21a..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/Makefile -+++ b/sysdeps/arm/armv7/multiarch/Makefile -@@ -1,3 +0,0 @@ --ifeq ($(subdir),string) --sysdep_routines += memcpy_neon memcpy_vfp memchr_neon --endif -diff --git a/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c b/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -index 8f33156317..1d11e03290 100644 ---- a/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -+++ b/sysdeps/arm/armv7/multiarch/ifunc-impl-list.c -@@ -31,30 +31,10 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, - { - size_t i = 0; - -- bool use_neon = true; --#ifdef __ARM_NEON__ --# define __memcpy_neon memcpy --# define __memchr_neon memchr --#else -- use_neon = (GLRO(dl_hwcap) & HWCAP_ARM_NEON) != 0; --#endif -- --#ifndef __ARM_NEON__ -- bool use_vfp = true; --# ifdef __SOFTFP__ -- use_vfp = (GLRO(dl_hwcap) & HWCAP_ARM_VFP) != 0; --# endif --#endif -- - IFUNC_IMPL (i, name, memcpy, -- IFUNC_IMPL_ADD (array, i, memcpy, use_neon, __memcpy_neon) --#ifndef __ARM_NEON__ -- IFUNC_IMPL_ADD (array, i, memcpy, use_vfp, __memcpy_vfp) --#endif - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_arm)); - - IFUNC_IMPL (i, name, memchr, -- IFUNC_IMPL_ADD (array, i, memchr, use_neon, __memchr_neon) - IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_noneon)); - - return i; -diff --git a/sysdeps/arm/armv7/multiarch/memcpy.S b/sysdeps/arm/armv7/multiarch/memcpy.S -index 8a53bdaf91..e1e13f8d2f 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy.S -@@ -23,37 +23,20 @@ - #include - - #if IS_IN (libc) --/* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */ --# ifndef __ARM_NEON__ - .text - ENTRY(memcpy) - .type memcpy, %gnu_indirect_function --# ifdef __SOFTFP__ - ldr r1, .Lmemcpy_arm -- tst r0, #HWCAP_ARM_VFP -- ldrne r1, .Lmemcpy_vfp --# else -- ldr r1, .Lmemcpy_vfp --# endif -- tst r0, #HWCAP_ARM_NEON -- ldrne r1, .Lmemcpy_neon - 1: - add r0, r1, pc - DO_RET(lr) - --# ifdef __SOFTFP__ - .Lmemcpy_arm: - .long C_SYMBOL_NAME(__memcpy_arm) - 1b - PC_OFS --# endif --.Lmemcpy_neon: -- .long C_SYMBOL_NAME(__memcpy_neon) - 1b - PC_OFS --.Lmemcpy_vfp: -- .long C_SYMBOL_NAME(__memcpy_vfp) - 1b - PC_OFS - - END(memcpy) - - libc_hidden_builtin_def (memcpy) --#endif /* Not __ARM_NEON__. */ - - /* These versions of memcpy are defined not to clobber any VFP or NEON - registers so they must always call the ARM variant of the memcpy code. */ -diff --git a/sysdeps/arm/armv7/multiarch/memcpy_neon.S b/sysdeps/arm/armv7/multiarch/memcpy_neon.S -index e60d1cc0e1..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy_neon.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy_neon.S -@@ -1,9 +0,0 @@ --#ifdef __ARM_NEON__ --/* Under __ARM_NEON__, this file defines memcpy directly. */ --libc_hidden_builtin_def (memcpy) --#else --# define memcpy __memcpy_neon --#endif -- --#define MEMCPY_NEON --#include "memcpy_impl.S" -diff --git a/sysdeps/arm/armv7/multiarch/memcpy_vfp.S b/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -index e008c041ed..e69de29bb2 100644 ---- a/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -+++ b/sysdeps/arm/armv7/multiarch/memcpy_vfp.S -@@ -1,7 +0,0 @@ --/* Under __ARM_NEON__, memcpy_neon.S defines memcpy directly -- and the __memcpy_vfp code will never be used. */ --#ifndef __ARM_NEON__ --# define MEMCPY_VFP --# define memcpy __memcpy_vfp --# include "memcpy_impl.S" --#endif --- -2.12.0 - diff --git a/recipes-core/glibc/glibc_2.%.bbappend b/recipes-core/glibc/glibc_2.%.bbappend deleted file mode 100644 index 3a90e89..0000000 --- a/recipes-core/glibc/glibc_2.%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/glibc-2.22:" -#SRC_URI_append = " file://0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch" -- cgit v1.2.3