[binutils] Enable -zrelro by default for RHEL 7+ as well as Fedora 18+ (#807831)

Nicholas Clifton nickc at fedoraproject.org
Mon Apr 2 16:42:12 UTC 2012


commit c51b2800bb9db3cc8bab16e2f90599963920c0d8
Author: Nick Clifton <nickc at redhat.com>
Date:   Mon Apr 2 17:37:42 2012 +0100

    Enable -zrelro by default for RHEL 7+ as well as Fedora 18+ (#807831)

 binutils.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/binutils.spec b/binutils.spec
index f4c2e8d..5da270d 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -149,7 +149,7 @@ using libelf instead of BFD.
 %patch08 -p1 -b .weakdef~
 %patch09 -p1 -b .ld-13621~
 %patch10 -p1 -b .cxxfilt-docs~
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %patch11 -p0 -b .relro~
 %endif
 %patch12 -p0 -b .x86_64-hidden-ifunc~
@@ -459,9 +459,9 @@ exit 0
 - Fix up handling of hidden ifunc relocs on x86_64
 - Add Intel TSX support
 
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 * Tue Mar 06 2012 Nick Clifton <nickc at redhat.com> - 2.22.52.0.1-7
-- Enable -zrelro be default. (#621983)
+- Enable -zrelro be default. (#621983 #807831)
 %endif
 
 * Mon Feb 27 2012 Jeff Law <law at redhat.com> - 2.22.52.0.1-6


More information about the scm-commits mailing list