648606
diff -uNr rpm-4.9.0-orig//macros.in rpm-4.9.0/macros.in
648606
--- rpm-4.9.0-orig//macros.in	2011-08-05 12:23:04.000000000 -0500
648606
+++ rpm-4.9.0/macros.in	2011-08-05 12:25:13.000000000 -0500
648606
@@ -1032,7 +1032,7 @@
648606
 
648606
 #------------------------------------------------------------------------------
648606
 # arch macro for all supported ARM processors
648606
-%arm	armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
648606
+%arm	armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l armv7hl armv7hnl
648606
 
648606
 #------------------------------------------------------------------------------
648606
 # arch macro for all supported Sparc processors
648606
diff -uNr rpm-4.9.0-orig//rpmrc.in rpm-4.9.0/rpmrc.in
648606
--- rpm-4.9.0-orig//rpmrc.in	2011-08-05 12:23:04.000000000 -0500
648606
+++ rpm-4.9.0/rpmrc.in	2011-08-05 12:26:34.000000000 -0500
648606
@@ -66,8 +66,10 @@
648606
 optflags: armv5tejl -O2 -g -march=armv5te
648606
 optflags: armv6l -O2 -g -march=armv6
648606
 optflags: armv7l -O2 -g -march=armv7
648606
+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
648606
+optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon
648606
 
648606
 optflags: m68k -O2 -g -fomit-frame-pointer
648606
 
648606
 optflags: atarist -O2 -g -fomit-frame-pointer
648606
 optflags: atariste -O2 -g -fomit-frame-pointer
648606
@@ -140,6 +142,8 @@
648606
 arch_canon:     armv5tejl: armv5tejl 	12
648606
 arch_canon:     armv6l: armv6l 	12
648606
 arch_canon:     armv7l: armv7l 	12
648606
+arch_canon:     armv7hl: armv7hl 	12
648606
+arch_canon:     armv7hnl: armv7hnl 	12
648606
 
648606
 arch_canon:	m68kmint: m68kmint	13
648606
 arch_canon:	atarist: m68kmint	13
648606
@@ -248,8 +252,10 @@
648606
 buildarchtranslate: armv5tejl: armv5tejl
648606
 buildarchtranslate: armv6l: armv6l
648606
 buildarchtranslate: armv7l: armv7l
648606
+buildarchtranslate: armv7hl: armv7hl
648606
+buildarchtranslate: armv7hnl: armv7hnl
648606
 
648606
 buildarchtranslate: m68k: m68k
648606
 
648606
 buildarchtranslate: atarist: m68kmint
648606
 buildarchtranslate: atariste: m68kmint
648606
@@ -336,8 +342,10 @@
648606
 arch_compat: armv4tl: armv4l
648606
 arch_compat: armv4l: armv3l
648606
 arch_compat: armv3l: noarch
648606
+arch_compat: armv7hnl: armv7hl
648606
+arch_compat: armv7hl: noarch
648606
 
648606
 arch_compat: m68k: noarch
648606
 
648606
 arch_compat: atarist: m68kmint noarch
648606
 arch_compat: atariste: m68kmint noarch
648606
@@ -441,6 +449,9 @@
648606
 buildarch_compat: armv4l: armv3l
648606
 buildarch_compat: armv3l: noarch
648606
 
648606
+buildarch_compat: armv7hnl: armv7hl
648606
+buildarch_compat: armv7hl: noarch
648606
+
648606
 buildarch_compat: hppa2.0: hppa1.2
648606
 buildarch_compat: hppa1.2: hppa1.1
648606
 buildarch_compat: hppa1.1: hppa1.0