From 19400997ddf345c8a23e0ff5c23fbb50a7ec23db Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 9 May 2018 12:01:43 +0200 Subject: [PATCH] Revert "Add annobin annotations to assembler code (downstream only)" CFLAGS is not generally used when calling assembler, and this eventually exposes a design issue in the annobin notes handling; see bug 1576362. This reverts commit d43610c36296acbbacc91174e19de44f294aeec0. --- glibc.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/glibc.spec b/glibc.spec index 00120b9..c7aa582 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.27-37-g39071a5539 %define glibcversion 2.27 -%define glibcrelease 9%{?dist} +%define glibcrelease 8%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -857,12 +857,6 @@ rpm_inherit_flags \ "-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" \ %endif -%if 0%{?rhel} > 0 -# Special flag to enable annobin annotations for statically linked -# assembler code. -BuildFlags="$BuildFlags -Wa,--generate-missing-build-notes=yes" -%endif - ############################################################################## # %%build - Generic options. ############################################################################## @@ -1972,9 +1966,6 @@ fi %endif %changelog -* Fri May 4 2018 Florian Weimer - 2.27-9 -- Add annobin annotations to assembler code (downstream only) - * Thu Mar 29 2018 Florian Weimer - 2.27-8 - Auto-sync with upstream branch release/2.27/master, commit 39071a55392d2d2e0b75fb19f2b48d661c4cc682.