diff --git a/glibc.spec b/glibc.spec
index 6122256..603a08f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -69,14 +69,6 @@
 %undefine with_valgrind
 %endif
 
-# The annobin annotations cause binutils to produce broken ARM EABI
-# unwinding information.  Symptom is a hang/test failure for
-# malloc/tst-malloc-stats-cancellation.  See
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1951492>.
-%ifarch armv7hl
-%undefine _annotated_build
-%endif
-
 # We do our own build flags management.  In particular, see
 # glibc_shell_* below.
 %undefine _auto_set_build_flags
@@ -350,10 +342,7 @@ BuildRequires: python3 python3-devel
 BuildRequires: gcc >= 7.2.1-6
 %global enablekernel 3.2
 Conflicts: kernel < %{enablekernel}
-%global target %{_target_cpu}-redhat-linux
-%ifarch %{arm}
-%global target %{_target_cpu}-redhat-linuxeabi
-%endif
+%define target %{_target_cpu}-redhat-linux
 %ifarch ppc64le
 %global target ppc64le-redhat-linux
 %endif