From ce02ed113393070ccee615abff5e2d3b2a7ce529 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 29 May 2022 16:30:45 +0000
Subject: [PATCH] core/glibc to 2.35-5.1

---
 core/glibc/PKGBUILD | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 615d68a70..e6e005b2f 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -17,7 +17,7 @@ noautobuild=1
 pkgname=glibc
 pkgver=2.35
 _commit=28ea43f8d64f0dd1f2de75525157730e1532e600
-pkgrel=5
+pkgrel=5.1
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL LGPL)
@@ -68,8 +68,8 @@ build() {
   cd "$srcdir/glibc-build"
 
   # ALARM: Specify build host types
-  [[ $CARCH == "armv7h" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabihf --build=armv7l-unknown-linux-gnueabihf"
-  [[ $CARCH == "aarch64" ]] && CONFIGFLAG="--host=aarch64-unknown-linux-gnu --build=aarch64-unknown-linux-gnu"
+  [[ $CARCH == "armv7h" ]] && _configure_flags+=(--host=armv7l-unknown-linux-gnueabihf --build=armv7l-unknown-linux-gnueabihf)
+  [[ $CARCH == "aarch64" ]] && _configure_flags+=(--host=aarch64-unknown-linux-gnu --build=aarch64-unknown-linux-gnu --enable-memory-tagging)
 
   echo "slibdir=/usr/lib" >> configparms
   echo "rtlddir=/usr/lib" >> configparms
@@ -84,8 +84,7 @@ build() {
   "$srcdir/glibc/configure" \
       --libdir=/usr/lib \
       --libexecdir=/usr/lib \
-      "${_configure_flags[@]}" \
-      $CONFIGFLAG
+      "${_configure_flags[@]}"
 
   # build libraries with fortify disabled
   echo "build-programs=no" >> configparms