From fae592ce2a3d1f7f24844949947198e172b33be6 Mon Sep 17 00:00:00 2001
From: Chad Wagner <47257594+wagnerch@users.noreply.github.com>
Date: Sat, 5 Jun 2021 20:03:23 +0000
Subject: [PATCH 1/2] Revert "gperftools: fix for release files" Revert "kodi:
 preload libtcmalloc_minimal.so if present" Revert "virtual/libc: buid
 tcmalloc_minimal for ARM" Revert "gperftools: add package providing
 tcmalloc_minimal"

This reverts commits:
68ee7158df39af3bbf5969ef19702bdf88f5088d
817f2bfa69571a21ba7acde35e679c498c8063ac
0bd162f15d1e4884ffe4ee1b813c45fc7888ec05
9ca7acaa1ab765335f1423f38f2e3d5678e282ef
---
 packages/devel/gperftools/package.mk          | 13 -------------
 packages/mediacenter/kodi/scripts/kodi-config |  4 ----
 packages/virtual/libc/package.mk              |  2 +-
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 packages/devel/gperftools/package.mk

diff --git a/packages/devel/gperftools/package.mk b/packages/devel/gperftools/package.mk
deleted file mode 100644
index 1b43f11c53..0000000000
--- a/packages/devel/gperftools/package.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="gperftools"
-PKG_VERSION="2.9.1"
-PKG_SHA256="ea566e528605befb830671e359118c2da718f721c27225cbbc93858c7520fee3"
-PKG_LICENSE="BSD"
-PKG_SITE="https://github.com/gperftools/gperftools"
-PKG_URL="https://github.com/gperftools/gperftools/releases/download/gperftools-${PKG_VERSION}/gperftools-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Google Performance Tools"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-minimal --disable-debugalloc --disable-static"
diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config
index 668b706101..5844ebc6c0 100755
--- a/packages/mediacenter/kodi/scripts/kodi-config
+++ b/packages/mediacenter/kodi/scripts/kodi-config
@@ -43,10 +43,6 @@ else #arm
   echo "MALLOC_MMAP_THRESHOLD_=8192" >> /run/libreelec/kodi.conf
 fi
 
-if [ -f /usr/lib/libtcmalloc_minimal.so ] ; then
-  echo "LD_PRELOAD=/usr/lib/libtcmalloc_minimal.so" >> /run/libreelec/kodi.conf
-fi
-
 if [ -f /storage/.config/kodi.conf ] ; then
   cat /storage/.config/kodi.conf >>/run/libreelec/kodi.conf
 fi
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index e66b9f745c..01f646d185 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -13,6 +13,6 @@ PKG_SECTION="virtual"
 PKG_LONGDESC="Meta package for installing various tools and libs needed for libc"
 
 if [ "${TARGET_ARCH}" = "arm" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem gperftools"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem"
   PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init"
 fi

From 9b4b7c7a754b905be6a80b7d0e01110cdeee2010 Mon Sep 17 00:00:00 2001
From: Portisch <hugo.portisch@yahoo.de>
Date: Sat, 5 Jun 2021 20:11:35 +0200
Subject: [PATCH 2/2] glibc: add patch to increase TLS alignment to stay
 compatible with newer Widevine CDM modules Since 4.10.2252.0 a TLS alignment
 of 64 bytes is used but glibc dlopen is limited to 16 and will end up with:
 'cannot allocate memory in static TLS block'

---
 ...dm.so-since-4.10.2252.0-has-TLS-with.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch

diff --git a/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch b/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch
new file mode 100644
index 0000000000..1a84602b10
--- /dev/null
+++ b/packages/devel/glibc/patches/arm/glibc-tls-libwidevinecdm.so-since-4.10.2252.0-has-TLS-with.patch
@@ -0,0 +1,31 @@
+From 61b3b546450ae0a70cb4a57fbb0e0fc47b331370 Mon Sep 17 00:00:00 2001
+From: Portisch <hugo.portisch@yahoo.de>
+Date: Sat, 5 Jun 2021 19:41:25 +0200
+Subject: [PATCH] tls: libwidevinecdm.so: since 4.10.2252.0 has TLS with
+ 64-byte alignment Change the max_align to 64U instead 16 to make it possible
+ to use dlopen again. Tests by changing TLS_TCB_ALIGN directly showed up some
+ random crashes. Reverence: https://lkml.org/lkml/2020/7/3/754
+
+---
+ elf/dl-tls.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/elf/dl-tls.c b/elf/dl-tls.c
+index 9fa62f5d..d8f2f740 100644
+--- a/elf/dl-tls.c
++++ b/elf/dl-tls.c
+@@ -213,6 +213,11 @@ void
+ _dl_determine_tlsoffset (void)
+ {
+   size_t max_align = TLS_TCB_ALIGN;
++  /* libwidevinecdm.so: since 4.10.2252.0 has TLS with 64-byte alignment.
++     Since TLS is initialized before audit modules are loaded and slotinfo
++     information is available, this is not taken into account below in
++     the audit case.  */
++  max_align = MAX (max_align, 64U);
+   size_t freetop = 0;
+   size_t freebottom = 0;
+ 
+-- 
+2.31.1
+