From 67ea2f3a6c000bc860ad2c9071e918267156a5fc9f2645152aee200c62481e80 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 12 Apr 2021 13:42:33 +0000
Subject: [PATCH] Accepting request 884677 from home:Andreas_Schwab:Factory

- Don't remove -f[asynchronous-]unwind-tables during configure run, no
  longer needed

OBS-URL: https://build.opensuse.org/request/show/884677
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=588
---
 glibc.changes |  6 ++++++
 glibc.spec    | 14 ++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/glibc.changes b/glibc.changes
index 427fe31..983a804 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 23 16:55:51 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Don't remove -f[asynchronous-]unwind-tables during configure run, no
+  longer needed
+
 -------------------------------------------------------------------
 Mon Mar  8 10:43:30 UTC 2021 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 108387e..5aa3047 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -574,22 +574,13 @@ BuildCCplus="%__cxx"
 #
 mkdir cc-base
 cd cc-base
-%ifarch %arm aarch64
-# remove [asynchronous-]unwind-tables during configure as it causes
-# some checks to fail spuriously on arm
-conf_cflags="${BuildFlags/-fasynchronous-unwind-tables/}"
-conf_cflags="${conf_cflags/-funwind-tables/}"
-%else
-conf_cflags="$BuildFlags"
-%endif
-
 %if %{build_profile}
 profile="--enable-profile"
 %else
 profile="--disable-profile"
 %endif
 ../configure \
-	CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
+	CFLAGS="$BuildFlags" BUILD_CFLAGS="$BuildFlags" \
 	CC="$BuildCC" CXX="$BuildCCplus" \
 	--prefix=%{_prefix} \
 	--libexecdir=%{_libexecdir} --infodir=%{_infodir} \
@@ -626,8 +617,7 @@ profile="--disable-profile"
 	--enable-systemtap \
 	--disable-timezone-tools \
 	--disable-crypt
-# explicitly set CFLAGS to use the full CFLAGS (not the reduced one for configure)
-make %{?_smp_mflags} CFLAGS="$BuildFlags" BUILD_CFLAGS="$BuildFlags"
+make %{?_smp_mflags}
 cd ..
 
 #