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

Add annobin annotations to assembler code (#1548438)

Browse Source
This commit is contained in:
Florian Weimer 2018-07-04 16:35:00 +02:00
parent 43a21403fe
commit 8a71833984
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glibc-asflags.patch Normal file
View File

@ -0,0 +1,25 @@
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Jul 4 16:16:57 2018 +0200
Makeconfig (ASFLAGS): Always append required assembler flags.
Submitted upstream here:
https://sourceware.org/ml/libc-alpha/2018-07/msg00077.html
Otherwise, we lose essential flags such as -Wa,--noexecstack due to
the way += works in make due to the ASFLAGS command line override.
diff --git a/Makeconfig b/Makeconfig
index b0b27f0113ac18b8..92e76d6200bbcd5b 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1047,7 +1047,7 @@ endif
ifndef ASFLAGS
ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
endif
-ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
+override ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
ifndef BUILD_CC
BUILD_CC = $(CC)

17
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.27.9000-545-gb7b88cea41 %define glibcsrcdir glibc-2.27.9000-545-gb7b88cea41
%define glibcversion 2.27.9000 %define glibcversion 2.27.9000
%define glibcrelease 31%{?dist} %define glibcrelease 32%{?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:
# #
@ -181,6 +181,7 @@ Patch0017: glibc-cs-path.patch
Patch0018: glibc-c-utf8-locale.patch Patch0018: glibc-c-utf8-locale.patch
Patch23: glibc-python3.patch Patch23: glibc-python3.patch
Patch24: glibc-with-nonshared-cflags.patch Patch24: glibc-with-nonshared-cflags.patch
Patch25: glibc-asflags.patch
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
@ -255,8 +256,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.29 is needed for static PIE support in i386/x86_64. # binutils 2.30-17 is needed for --generate-missing-build-notes.
BuildRequires: binutils >= 2.29 BuildRequires: binutils >= 2.30-17
# 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
@ -771,6 +772,11 @@ rpm_inherit_flags \
"-mtune=zEC12" \ "-mtune=zEC12" \
"-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. Needs to be passed to make; not preserved by
# configure.
%define glibc_make_flags ASFLAGS="-g -Wa,--generate-missing-build-notes=yes"
############################################################################## ##############################################################################
# %%build - Generic options. # %%build - Generic options.
############################################################################## ##############################################################################
@ -819,7 +825,7 @@ build()
--disable-crypt || --disable-crypt ||
{ cat config.log; false; } { cat config.log; false; }
make %{?_smp_mflags} -O -r make %{?_smp_mflags} -O -r %{glibc_make_flags}
popd popd
} }
@ -1880,6 +1886,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Jul 4 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-32
- Add annobin annotations to assembler code (#1548438)
* Wed Jul 4 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-31 * Wed Jul 4 2018 Florian Weimer <fweimer@redhat.com> - 2.27.9000-31
- Enable -D_FORTIFY_SOURCE=2 for nonshared code - Enable -D_FORTIFY_SOURCE=2 for nonshared code