From 2a1adf47969dbd1f3ec9d7081a31afecd13ad427 Mon Sep 17 00:00:00 2001
From: Jon Masters <jcm@jonmasters.org>
Date: Jul 02 2011 09:03:25 +0000
Subject: redhat-rpm-config: change default arch level target for all ARM v7 to armv7hl


All ARM version 7 systems support a vector hardware floating point unit and
have the ability to run using the hard floating point ABI (aapcs-vfpv3-d16).
This is the only configuration we support as a v7 target, so we force the
use of hard floating point. This prevents e.g. packages being built with
a armv5tel target on an armv7 system without explicit intent.

Signed-off-by: Jon Masters <jcm@jonmasters.org>

---

diff --git a/redhat-rpm-config-9.1.0-arm.patch b/redhat-rpm-config-9.1.0-arm.patch
index a6b792b..f620294 100644
--- a/redhat-rpm-config-9.1.0-arm.patch
+++ b/redhat-rpm-config-9.1.0-arm.patch
@@ -1,7 +1,7 @@
-diff -uNr redhat-rpm-config-9.1.0-orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
---- redhat-rpm-config-9.1.0-orig/rpmrc	2010-02-02 03:24:04.000000000 -0600
-+++ redhat-rpm-config-9.1.0/rpmrc	2011-06-13 10:40:02.000000000 -0500
-@@ -46,10 +46,12 @@
+diff -urNp redhat-rpm-config-9.1.0_orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
+--- redhat-rpm-config-9.1.0_orig/rpmrc	2010-02-02 04:24:04.000000000 -0500
++++ redhat-rpm-config-9.1.0/rpmrc	2011-07-02 04:29:11.921575635 -0400
+@@ -46,10 +46,12 @@ optflags: armv3l %{__global_cflags} -fsi
  optflags: armv4b %{__global_cflags} -fsigned-char -march=armv4
  optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4
  optflags: armv4tl %{__global_cflags} -march=armv4t
@@ -18,9 +18,12 @@ diff -uNr redhat-rpm-config-9.1.0-orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
  
  optflags: atarist %{__global_cflags}
  optflags: atariste %{__global_cflags}
-@@ -77,4 +79,5 @@
+@@ -76,5 +78,7 @@ buildarchtranslate: sparcv9v: sparcv9
+ 
  buildarchtranslate: armv5tejl: armv5tel
  buildarchtranslate: armv6l: armv5tel
- buildarchtranslate: armv7l: armv5tel
+-buildarchtranslate: armv7l: armv5tel
++buildarchtranslate: armv7l: armv7hl
++buildarchtranslate: armv7hl: armv7hl
 +buildarchtranslate: armv7hnl: armv7hl
  
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 5dc118a..2a14b21 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: 10%{?dist}
+Release: 12%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -55,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Sat Jul 02 2011 Jon Masters <jcm@jonmasters.org> - 9.1.0-12
+- redhat-rpm-config-9.1.0-arm.patch: Make armv7hl default on all v7 ARM
+
 * Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-10
 - revert last build since releng prefers exclusivearch here