From 23b1fa6b082e7338180afc9404dead13d5f1dc1e Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 15 Mar 2019 08:27:09 +0000
Subject: [PATCH] arm-mem: use for all arm-based builds

---
 packages/devel/arm-mem/package.mk | 2 +-
 packages/virtual/libc/package.mk  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index d90efd134c..d4620139a7 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -14,7 +14,7 @@ PKG_DEPENDS_INIT="toolchain arm-mem"
 PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h"
 PKG_BUILD_FLAGS="+pic"
 
-if [ "$DEVICE" = "RPi2" -o "$DEVICE" = "Slice3" ] ; then
+if target_has_feature neon; then
   PKG_LIB_ARM_MEM="libarmmem-v7l.so"
 else
   PKG_LIB_ARM_MEM="libarmmem-v6l.so"
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index 8eee785588..1f92ddaed2 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libc"
 PKG_VERSION=""
@@ -11,7 +12,7 @@ PKG_DEPENDS_INIT="toolchain glibc:init"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Meta package for installing various tools and libs needed for libc"
 
-if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
+if [ "${TARGET_ARCH}" = "arm" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem"
   PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init"
 fi