rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Revert "Add annobin annotations to assembler code (#1548438)"

Browse Source 
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 7c1047805b.
This commit is contained in:
Florian Weimer 2018-05-09 11:26:57 +02:00
parent 7c1047805b
commit c491e21bc7
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27.9000-326-g0085be1415 %define glibcsrcdir glibc-2.27.9000-326-g0085be1415
%define glibcversion 2.27.9000 %define glibcversion 2.27.9000
%define glibcrelease 16%{?dist} %define glibcrelease 15%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -235,8 +235,8 @@ BuildRequires: make >= 4.0
# The intl subsystem generates a parser using bison. # The intl subsystem generates a parser using bison.
BuildRequires: bison >= 2.7 BuildRequires: bison >= 2.7
# binutils 2.30-17 is needed for --generate-missing-build-notes. # binutils 2.29 is needed for static PIE support in i386/x86_64.
BuildRequires: binutils >= 2.30-17 BuildRequires: binutils >= 2.29
# Earlier releases have broken support for IRELATIVE relocations # Earlier releases have broken support for IRELATIVE relocations
Conflicts: prelink < 0.4.2 Conflicts: prelink < 0.4.2
@ -736,11 +736,6 @@ rpm_inherit_flags \
"-m64" \ "-m64" \
"-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" \ "-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" \
# Special flag to enable annobin annotations for statically linked
# assembler code.
BuildFlags="$BuildFlags -Wa,--generate-missing-build-notes=yes"
############################################################################## ##############################################################################
# %%build - Generic options. # %%build - Generic options.
############################################################################## ##############################################################################
@ -1850,9 +1845,6 @@ fi
%endif %endif
%changelog %changelog
* Fri May 4 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-16
- Add annobin annotations to assembler code (#1548438)
* Thu Apr 19 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-15 * Thu Apr 19 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-15
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,
commit 0085be1415a38b40a5a1a12e49368498f1687380. commit 0085be1415a38b40a5a1a12e49368498f1687380.