From 4b27de8d70582ab51a4f07b4788a17fad5fed5e1 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 23 Apr 2013 07:31:50 +0300
Subject: [PATCH] - Add optflags stack protector override for AArch64 (#909788)

---
 redhat-rpm-config-9.1.0-aarch64.patch | 13 +++++++++++++
 redhat-rpm-config.spec                |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 redhat-rpm-config-9.1.0-aarch64.patch

diff --git a/redhat-rpm-config-9.1.0-aarch64.patch b/redhat-rpm-config-9.1.0-aarch64.patch
new file mode 100644
index 0000000..03456d2
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-aarch64.patch
@@ -0,0 +1,13 @@
+diff --git a/rpmrc b/rpmrc
+index 9127200..fe2f84b 100644
+--- a/rpmrc
++++ b/rpmrc
+@@ -64,6 +64,8 @@ optflags: hades %{__global_cflags}
+ optflags: s390 %{__global_cflags} -m31 -march=z9-109 -mtune=z10
+ optflags: s390x %{__global_cflags} -m64 -march=z9-109 -mtune=z10
+ 
++optflags: aarch64 %{__global_cflags} -fno-stack-protector
++
+ # set build arch to fedora buildarches on hardware capable of running it
+ # saves having to do rpmbuild --target=
+ buildarchtranslate: athlon: i686
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 8f0f820..56873ea 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 42%{?dist}
+Release: 43%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -53,6 +53,8 @@ Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
 Patch18: redhat-rpm-config-9.1.0-record-switches.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=951442
 Patch19: redhat-rpm-config-9.1.0-configfoo.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=909788
+Patch20: redhat-rpm-config-9.1.0-aarch64.patch
 BuildArch: noarch
 Requires: coreutils
 Requires: perl-srpm-macros
@@ -86,6 +88,7 @@ Red Hat specific rpm configuration files.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 
@@ -107,6 +110,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Tue Apr 23 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-43
+- Add optflags stack protector override for AArch64 (#909788)
+
 * Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-42
 - Switch back to manual config.guess/sub copies for reproducability
 - Replace config.guess/sub from %%configure again (#951442)