From 52f0fdc4a1f960852c388fe8bc5295948e2e7063 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 21 May 2021 16:16:49 +0200
Subject: [PATCH] Sync with Fedora f34 branch (glibc-2.33-12) (#1948645)

aarch64: Enable optional memory tagging support

Resolves: #1948645
---
 glibc.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/glibc.spec b/glibc.spec
index 4a1ccda..46e4c0e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -77,12 +77,13 @@
 %define need_headers_package 0
 %endif
 
+##############################################################################
 # %%package glibc - The GNU C Library (glibc) core package.
 ##############################################################################
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -1151,6 +1152,11 @@ build()
 		--disable-profile \
 %if %{with bootstrap}
 		--without-selinux \
+%endif
+%ifarch aarch64
+%if 0%{?rhel} > 0
+		--enable-memory-tagging \
+%endif
 %endif
 		--disable-crypt ||
 		{ cat config.log; false; }
@@ -2140,6 +2146,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Fri May 21 2021 Florian Weimer <fweimer@redhat.com> - 2.33-12
+- aarch64: Enable optional memory tagging support (#1948645)
+
 * Fri May  7 2021 Florian Weimer <fweimer@redhat.com> - 2.33-11
 - Sync with Fedora f34 branch, commit 4f55bd2df5c705c99f21.
 - This removes the forced setting of the z14/POWER9 baselines,