--- rpmrc.in.orig	2023-09-19 10:10:10.000000000 +0000

+++ rpmrc.in	2023-10-09 12:44:42.206519465 +0000

@@ -12,19 +12,19 @@

 # "fat" binary with both archs, for Darwin

 optflags: fat -O2 -g -arch i386 -arch ppc

-optflags: i386 -O2 -g -march=i386 -mtune=i686

-optflags: i486 -O2 -g -march=i486

-optflags: i586 -O2 -g -march=i586

-optflags: i686 -O2 -g -march=i686

-optflags: pentium3 -O2 -g -march=pentium3

-optflags: pentium4 -O2 -g -march=pentium4

-optflags: athlon -O2 -g -march=athlon

+optflags: i386 -O2 -g -m32 -march=i486 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: i486 -O2 -g -m32 -march=i486 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: i586 -O2 -g -m32 -march=i586 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: i686 -O2 -g -m32 -march=i686 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: pentium3 -O2 -g -m32 -march=pentium3

+optflags: pentium4 -O2 -g -m32 -march=pentium4

+optflags: athlon -O2 -g -m32 -march=athlon

 optflags: geode -Os -g -m32 -march=geode

-optflags: ia64 -O2 -g

-optflags: x86_64 -O2 -g

-optflags: x86_64_v2 -O2 -g -march=x86-64-v2

-optflags: x86_64_v3 -O2 -g -march=x86-64-v3

-optflags: x86_64_v4 -O2 -g -march=x86-64-v4

+optflags: ia64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: x86_64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: x86_64_v2 -O2 -g -march=x86-64-v2 -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: x86_64_v3 -O2 -g -march=x86-64-v3 -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: x86_64_v4 -O2 -g -march=x86-64-v4 -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

 optflags: amd64 -O2 -g

 optflags: ia32e -O2 -g

@@ -44,17 +44,18 @@ optflags: sparc64v -O2 -g -m64 -mtune=ni

 optflags: m68k -O2 -g -fomit-frame-pointer

-optflags: ppc -O2 -g

-optflags: ppc8260 -O2 -g

-optflags: ppc8560 -O2 -g

-optflags: ppc32dy4 -O2 -g

-optflags: ppciseries -O2 -g

-optflags: ppcpseries -O2 -g

-optflags: ppc64 -O2 -g

-optflags: ppc64le -O2 -g

-optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g

+optflags: ppc -O2 -g -m32 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: ppc8260 -O2 -g -m32

+optflags: ppc8560 -O2 -g -m32

+optflags: ppc32dy4 -O2 -g -m32

+optflags: ppciseries -O2 -g -m32

+optflags: ppcpseries -O2 -g -m32

+optflags: ppc64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: ppc64le -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: ppc64p7 -O3 -mtune=power7 -mcpu=power7 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

 optflags: parisc -O2 -g -mpa-risc-1-0

+optflags: hppa -O2 -g -mpa-risc-1-0

 optflags: hppa1.0 -O2 -g -mpa-risc-1-0

 optflags: hppa1.1 -O2 -g -mpa-risc-1-0

 optflags: hppa1.2 -O2 -g -mpa-risc-1-0

@@ -78,10 +79,10 @@ optflags: armv5tl -O2 -g -march=armv5t

 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: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mabi=aapcs-linux

 optflags: armv7l -O2 -g -march=armv7

-optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16

+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb -mabi=aapcs-linux

 optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon

 optflags: armv8l -O2 -g -march=armv8-a

 optflags: armv8hl -O2 -g -march=armv8-a -mfloat-abi=hard -mfpu=vfpv4

@@ -96,8 +97,8 @@ optflags: atariclone -O2 -g -fomit-frame

 optflags: milan -O2 -g -fomit-frame-pointer

 optflags: hades -O2 -g -fomit-frame-pointer

-optflags: s390 -O2 -g

-optflags: s390x -O2 -g

+optflags: s390 -O2 -g -m31 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

+optflags: s390x -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables

 optflags: sh3 -O2 -g

 optflags: sh4 -O2 -g -mieee

@@ -309,17 +310,17 @@ os_canon:       MacOSX: macosx	21

 #############################################################

 # For a given uname().machine, the default build arch

-buildarchtranslate: osfmach3_i686: i386

-buildarchtranslate: osfmach3_i586: i386

+buildarchtranslate: osfmach3_i686: i586

+buildarchtranslate: osfmach3_i586: i586

 buildarchtranslate: osfmach3_i486: i386

 buildarchtranslate: osfmach3_i386: i386

-buildarchtranslate: athlon: i386

-buildarchtranslate: geode: i386

-buildarchtranslate: pentium4: i386

-buildarchtranslate: pentium3: i386

-buildarchtranslate: i686: i386

-buildarchtranslate: i586: i386

+buildarchtranslate: athlon: i586

+buildarchtranslate: geode: i586

+buildarchtranslate: pentium4: i586

+buildarchtranslate: pentium3: i586

+buildarchtranslate: i686: i586

+buildarchtranslate: i586: i586

 buildarchtranslate: i486: i386

 buildarchtranslate: i386: i386

@@ -341,6 +342,7 @@ buildarchtranslate: sparc64v: sparc64

 buildarchtranslate: osfmach3_ppc: ppc

 buildarchtranslate: powerpc: ppc

 buildarchtranslate: powerppc: ppc

+buildarchtranslate: powerpc64: ppc64

 buildarchtranslate: ppc8260: ppc

 buildarchtranslate: ppc8560: ppc

 buildarchtranslate: ppc32dy4: ppc

@@ -409,6 +411,15 @@ buildarchtranslate: riscv64: riscv64

 buildarchtranslate: loongarch64: loongarch64

+buildarchtranslate: parisc: hppa

+buildarchtranslate: hppa2.0: hppa

+buildarchtranslate: hppa64: hppa

+

+buildarchtranslate: armv5l: armv4l

+buildarchtranslate: armv5tel: armv4l

+buildarchtranslate: armv5b: armv4b

+buildarchtranslate: armv5teb: armv4b

+

 #############################################################

 # Architecture compatibility

@@ -473,16 +484,20 @@ arch_compat: mips64r6el: mipsr6el

 arch_compat: hppa2.0: hppa1.2

 arch_compat: hppa1.2: hppa1.1

 arch_compat: hppa1.1: hppa1.0

-arch_compat: hppa1.0: parisc

+arch_compat: hppa1.0: hppa

+arch_compat: hppa: parisc

 arch_compat: parisc: noarch

+arch_compat: armv5teb: armv5b

+arch_compat: armv5b: armv4b

 arch_compat: armv4b: noarch

 arch_compat: armv8l: armv7l

 arch_compat: armv7l: armv6l

 arch_compat: armv6l: armv5tejl

 arch_compat: armv5tejl: armv5tel

 arch_compat: armv5tel: armv5tl

-arch_compat: armv5tl: armv4tl

+arch_compat: armv5tl: armv5l

+arch_compat: armv5l: armv4tl

 arch_compat: armv4tl: armv4l

 arch_compat: armv4l: armv3l

 arch_compat: armv3l: noarch

@@ -505,7 +520,7 @@ arch_compat: i370: noarch

 arch_compat: s390: noarch

 arch_compat: s390x: s390 noarch

-arch_compat: ia64: noarch

+arch_compat: ia64: i686 noarch

 arch_compat: x86_64: amd64 em64t athlon noarch

 arch_compat: amd64: x86_64 em64t athlon noarch

@@ -634,7 +649,8 @@ buildarch_compat: armv6hl: noarch

 buildarch_compat: hppa2.0: hppa1.2

 buildarch_compat: hppa1.2: hppa1.1

 buildarch_compat: hppa1.1: hppa1.0

-buildarch_compat: hppa1.0: parisc

+buildarch_compat: hppa1.0: hppa

+buildarch_compat: hppa: parisc

 buildarch_compat: parisc: noarch

 buildarch_compat: atarist: m68kmint noarch