rpm/rpm-4.9.90-armhfp.patch

diff --git a/macros.in b/macros.in
index 5ae8c2b..1234409 100644
--- a/macros.in
+++ b/macros.in
@@ -999,7 +999,7 @@ done \
 
 #------------------------------------------------------------------------------
 # arch macro for all supported ARM processors
-%arm	armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
+%arm	armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl
 
 #------------------------------------------------------------------------------
 # arch macro for all supported Sparc processors
diff --git a/rpmrc.in b/rpmrc.in
index 0427913..bd39204 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -67,7 +67,11 @@ optflags: armv4tl -O2 -g -march=armv4t
 optflags: armv5tel -O2 -g -march=armv5te
 optflags: armv5tejl -O2 -g -march=armv5te
 optflags: armv6l -O2 -g -march=armv6
+optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mfpu=vfp
+
 optflags: armv7l -O2 -g -march=armv7
+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
+optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon
 
 optflags: atarist -O2 -g -fomit-frame-pointer
 optflags: atariste -O2 -g -fomit-frame-pointer
@@ -180,7 +184,10 @@ arch_canon:     armv4l:	armv4l 	12
 arch_canon:     armv5tel: armv5tel 	12
 arch_canon:     armv5tejl: armv5tejl 	12
 arch_canon:     armv6l: armv6l 	12
+arch_canon:     armv6hl: armv6hl 	12
 arch_canon:     armv7l: armv7l 	12
+arch_canon:     armv7hl: armv7hl 	12
+arch_canon:     armv7hnl: armv7hnl 	12
 
 arch_canon:	m68kmint: m68kmint	13
 arch_canon:	atarist: m68kmint	13
@@ -293,7 +300,10 @@ buildarchtranslate: armv4tl: armv4tl
 buildarchtranslate: armv5tel: armv5tel
 buildarchtranslate: armv5tejl: armv5tejl
 buildarchtranslate: armv6l: armv6l
+buildarchtranslate: armv6hl: armv6hl
 buildarchtranslate: armv7l: armv7l
+buildarchtranslate: armv7hl: armv7hl
+buildarchtranslate: armv7hnl: armv7hnl
 
 buildarchtranslate: atarist: m68kmint
 buildarchtranslate: atariste: m68kmint
@@ -386,6 +396,9 @@ arch_compat: armv5tel: armv4tl
 arch_compat: armv4tl: armv4l
 arch_compat: armv4l: armv3l
 arch_compat: armv3l: noarch
+arch_compat: armv7hnl: armv7hl
+arch_compat: armv7hl: armv6hl
+arch_compat: armv6hl: noarch
 
 arch_compat: atarist: m68kmint noarch
 arch_compat: atariste: m68kmint noarch
@@ -497,6 +510,10 @@ buildarch_compat: armv4tl: armv4l
 buildarch_compat: armv4l: armv3l
 buildarch_compat: armv3l: noarch
 
+buildarch_compat: armv7hnl: armv7hl
+buildarch_compat: armv7hl: armv6hl
+buildarch_compat: armv6hl: noarch
+
 buildarch_compat: hppa2.0: hppa1.2
 buildarch_compat: hppa1.2: hppa1.1
 buildarch_compat: hppa1.1: hppa1.0
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`diff --git a/macros.in b/macros.in`
			`index 5ae8c2b..1234409 100644`
			`--- a/macros.in`
			`+++ b/macros.in`
			`@@ -999,7 +999,7 @@ done \`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00
			`#------------------------------------------------------------------------------`
			`# arch macro for all supported ARM processors`
			`-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00
			`#------------------------------------------------------------------------------`
			`# arch macro for all supported Sparc processors`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`diff --git a/rpmrc.in b/rpmrc.in`
			`index 0427913..bd39204 100644`
			`--- a/rpmrc.in`
			`+++ b/rpmrc.in`
			`@@ -67,7 +67,11 @@ optflags: armv4tl -O2 -g -march=armv4t`
			`optflags: armv5tel -O2 -g -march=armv5te`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`optflags: armv5tejl -O2 -g -march=armv5te`
			`optflags: armv6l -O2 -g -march=armv6`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mfpu=vfp`
			`+`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`optflags: armv7l -O2 -g -march=armv7`
- armv7hl and armv7hnl should not have -mthumb (#901901) 2013-01-28 12:01:01 +00:00			`+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16`
			`+optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00
			`optflags: atarist -O2 -g -fomit-frame-pointer`
			`optflags: atariste -O2 -g -fomit-frame-pointer`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`@@ -180,7 +184,10 @@ arch_canon: armv4l: armv4l 12`
			`arch_canon: armv5tel: armv5tel 12`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`arch_canon: armv5tejl: armv5tejl 12`
			`arch_canon: armv6l: armv6l 12`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+arch_canon: armv6hl: armv6hl 12`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`arch_canon: armv7l: armv7l 12`
			`+arch_canon: armv7hl: armv7hl 12`
			`+arch_canon: armv7hnl: armv7hnl 12`

			`arch_canon: m68kmint: m68kmint 13`
			`arch_canon: atarist: m68kmint 13`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`@@ -293,7 +300,10 @@ buildarchtranslate: armv4tl: armv4tl`
			`buildarchtranslate: armv5tel: armv5tel`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`buildarchtranslate: armv5tejl: armv5tejl`
			`buildarchtranslate: armv6l: armv6l`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+buildarchtranslate: armv6hl: armv6hl`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`buildarchtranslate: armv7l: armv7l`
			`+buildarchtranslate: armv7hl: armv7hl`
			`+buildarchtranslate: armv7hnl: armv7hnl`

			`buildarchtranslate: atarist: m68kmint`
			`buildarchtranslate: atariste: m68kmint`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`@@ -386,6 +396,9 @@ arch_compat: armv5tel: armv4tl`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`arch_compat: armv4tl: armv4l`
			`arch_compat: armv4l: armv3l`
			`arch_compat: armv3l: noarch`
			`+arch_compat: armv7hnl: armv7hl`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+arch_compat: armv7hl: armv6hl`
			`+arch_compat: armv6hl: noarch`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00
			`arch_compat: atarist: m68kmint noarch`
			`arch_compat: atariste: m68kmint noarch`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`@@ -497,6 +510,10 @@ buildarch_compat: armv4tl: armv4l`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`buildarch_compat: armv4l: armv3l`
			`buildarch_compat: armv3l: noarch`

			`+buildarch_compat: armv7hnl: armv7hl`
Fix the armhfp patch for armv6hl The previous armhfp patches tried to cover armv6, but failed to do so properly -- the hfp extension for v6 is called "vfp", not "vfpv3" and there's no "neon" extension for it, this "armv6hnl" does not make sense at all. Because of this, Pidora decided to patch around it so that their armv6hl Raspberry Pi hardware is supported, breaking support for other ARMs along the way... 2014-06-18 20:38:37 +00:00			`+buildarch_compat: armv7hl: armv6hl`
			`+buildarch_compat: armv6hl: noarch`
conditionally apply arm patch for hardfp on all arches but arm softfp ones 2011-11-10 01:48:45 +00:00			`+`
			`buildarch_compat: hppa2.0: hppa1.2`
			`buildarch_compat: hppa1.2: hppa1.1`
			`buildarch_compat: hppa1.1: hppa1.0`