--- rpm-4.16.1.3/rpmrc.in.orig	2021-04-18 13:54:39.393090505 +0200
+++ rpm-4.16.1.3/rpmrc.in	2021-04-18 13:55:13.930721298 +0200
@@ -77,7 +77,7 @@
 optflags: armv6l -O2 -g -march=armv6
 optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mfpu=vfp
 
-optflags: armv7l -O2 -g -march=armv7
+optflags: armv7l -O2 -g -march=armv7-a
 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: armv8l -O2 -g -march=armv8-a
@@ -209,15 +209,16 @@
 arch_canon:	mips64:		mips64		11
 arch_canon:	mips64el:	mips64el	11
 
-arch_canon:	armv3l: armv3l	12
-arch_canon:     armv4b:	armv4b 	12
-arch_canon:     armv4l:	armv4l 	12
-arch_canon:     armv5tl: armv5tl 	12
-arch_canon:     armv5tel: armv5tel 	12
-arch_canon:     armv5tejl: armv5tejl 	12
-arch_canon:     armv6l: armv6l 	12
+arch_canon:	arm: arm	12
+arch_canon:	armv3l: arm	12
+arch_canon:     armv4b:	arm 	12
+arch_canon:     armv4l:	arm 	12
+arch_canon:     armv5tl: arm 	12
+arch_canon:     armv5tel: arm 	12
+arch_canon:     armv5tejl: arm 	12
+arch_canon:     armv6l: arm 	12
 arch_canon:     armv6hl: armv6hl 	12
-arch_canon:     armv7l: armv7l 	12
+arch_canon:     armv7l: arm 	12
 arch_canon:     armv7hl: armv7hl 	12
 arch_canon:     armv7hnl: armv7hnl 	12
 arch_canon:	armv8l: armv8l	12
@@ -464,7 +465,8 @@
 arch_compat: armv5tl: armv4tl
 arch_compat: armv4tl: armv4l
 arch_compat: armv4l: armv3l
-arch_compat: armv3l: noarch
+arch_compat: armv3l: arm
+arch_compat: arm: noarch
 arch_compat: armv8hl: armv7hl
 arch_compat: armv7hnl: armv7hl
 arch_compat: armv7hl: armv6hl
@@ -595,7 +597,8 @@
 buildarch_compat: armv5tl: armv4tl
 buildarch_compat: armv4tl: armv4l
 buildarch_compat: armv4l: armv3l
-buildarch_compat: armv3l: noarch
+buildarch_compat: armv3l: arm
+buildarch_compat: arm: noarch
 
 buildarch_compat: armv8hcnl: armv8hnl
 buildarch_compat: armv8hnl: armv8hl