[rpm] - Hopefully fix armv7 vfp/neon detection

[Panu Matilainen]

commit 017fe597e0e9dbc5150b8850b89e4bc3a04f5759
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Jul 2 14:32:57 2014 +0300

    - Hopefully fix armv7 vfp/neon detection

 rpm-4.11.90-arm-vfp3.patch |   18 ++++++++++++++++++
 rpm.spec                   |    2 ++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/rpm-4.11.90-arm-vfp3.patch b/rpm-4.11.90-arm-vfp3.patch
new file mode 100644
index 0000000..36027de
--- /dev/null
+++ b/rpm-4.11.90-arm-vfp3.patch
@@ -0,0 +1,18 @@
+diff -up rpm-4.11.90-git12844/lib/rpmrc.c.arm-vfp3 rpm-4.11.90-git12844/lib/rpmrc.c
+--- rpm-4.11.90-git12844/lib/rpmrc.c.arm-vfp3	2014-07-02 13:06:07.626643228 +0300
++++ rpm-4.11.90-git12844/lib/rpmrc.c	2014-07-02 13:06:24.290591042 +0300
+@@ -1156,11 +1156,11 @@ static void defaultMachine(rpmrcCtx ctx,
+ #	if !defined(HWCAP_ARM_NEON)
+ #	    define HWCAP_ARM_NEON	(1 << 12)
+ #	endif
+-#	if !defined(HWCAP_ARM_VFPv3D16)
+-#	    define HWCAP_ARM_VFPv3D16	(1 << 13)
++#	if !defined(HWCAP_ARM_VFPv3)
++#	    define HWCAP_ARM_VFPv3	(1 << 13)
+ #	endif
+ 	if (rstreq(un.machine, "armv7l")) {
+-	    if (rpmat.hwcap & HWCAP_ARM_VFPv3D16) {
++	    if (rpmat.hwcap & HWCAP_ARM_VFPv3) {
+ 		if (rpmat.hwcap & HWCAP_ARM_NEON)
+ 		    strcpy(un.machine, "armv7hnl");
+ 		else
diff --git a/rpm.spec b/rpm.spec
index b5aa2ae..c205d95 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -50,6 +50,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch
 # Patches already upstream:
 Patch100: rpm-4.11.90-hardlink-groups.patch
 Patch101: rpm-4.11.90-expand-load-arg.patch
+Patch102: rpm-4.11.90-arm-vfp3.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -530,6 +531,7 @@ exit 0
 %changelog
 * Wed Jul 02 2014 Panu Matilainen <pmatilai at redhat.com> - 4.11.90-0.git12844.4
 - Use autosetup for building rpm itself
+- Hopefully fix armv7 vfp/neon detection
 
 * Tue Jul 01 2014 Panu Matilainen <pmatilai at redhat.com> - 4.11.90-0.git12844.3
 - Drop no longer needed temporary UsrMove patch