From 4c63cb687ec667c6170420c81f464c1511c46ce4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Mar 2022 17:52:42 +0000 Subject: [PATCH] Remove unsupported arches from rpmrc I would like to try to move the optflags definition into the macro file to make it cleaner and easier to maintain, so to make that easier, I wanted to start by removing unsupported arches, so there is less code to move. --- redhat-rpm-config.spec | 5 +++- rpmrc | 68 +----------------------------------------- 2 files changed, 5 insertions(+), 68 deletions(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 4001dee..46058b0 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 233 +%global baserelease 234 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -221,6 +221,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Fri Jun 24 2022 Tom Stellard - 234-1 +- Remove unsupported arches from rpmrc + * Fri Nov 4 2022 Florian Weimer - 233-1 - Set -g when building Vala applications diff --git a/rpmrc b/rpmrc index d59bc63..38f20b7 100644 --- a/rpmrc +++ b/rpmrc @@ -5,73 +5,13 @@ optflags: i486 %{__global_compiler_flags} -m32 -march=i486 -fasynchronous-unwind optflags: i586 %{__global_compiler_flags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection optflags: i686 %{__global_compiler_flags} -m32 -march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection optflags: athlon %{__global_compiler_flags} -m32 -march=athlon -fasynchronous-unwind-tables -fstack-clash-protection -optflags: ia64 %{__global_compiler_flags} optflags: x86_64 %{__global_compiler_flags} -m64 %{__cflags_arch_x86_64} -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -optflags: alpha %{__global_compiler_flags} -mieee -optflags: alphaev5 %{__global_compiler_flags} -mieee -mcpu=ev5 -optflags: alphaev56 %{__global_compiler_flags} -mieee -mcpu=ev56 -optflags: alphapca56 %{__global_compiler_flags} -mieee -mcpu=pca56 -optflags: alphaev6 %{__global_compiler_flags} -mieee -mcpu=ev6 -optflags: alphaev67 %{__global_compiler_flags} -mieee -mcpu=ev67 - -optflags: sparc %{__global_compiler_flags} -m32 -mcpu=v7 -mtune=ultrasparc -optflags: sparcv8 %{__global_compiler_flags} -m32 -mcpu=v8 -optflags: sparcv9 %{__global_compiler_flags} -m32 -mcpu=ultrasparc -optflags: sparcv9v %{__global_compiler_flags} -m32 -mcpu=niagara -optflags: sparc64 %{__global_compiler_flags} -m64 -mcpu=ultrasparc -optflags: sparc64v %{__global_compiler_flags} -m64 -mcpu=niagara - -optflags: m68k %{__global_compiler_flags} - -optflags: ppc %{__global_compiler_flags} -m32 -fasynchronous-unwind-tables -optflags: ppciseries %{__global_compiler_flags} -m32 -optflags: ppcpseries %{__global_compiler_flags} -m32 -optflags: ppc64 %{__global_compiler_flags} -m64 -fasynchronous-unwind-tables -fstack-clash-protection -optflags: ppc64p7 %{__global_compiler_flags} -m64 -O3 -mcpu=power7 -mtune=power7 -fasynchronous-unwind-tables -fstack-clash-protection optflags: ppc64le %{__global_compiler_flags} -m64 %{__cflags_arch_ppc64le} -fasynchronous-unwind-tables -fstack-clash-protection -optflags: ppc64iseries %{__global_compiler_flags} -m64 -optflags: ppc64pseries %{__global_compiler_flags} -m64 -optflags: ppc8260 %{__global_compiler_flags} -m32 -optflags: ppc8560 %{__global_compiler_flags} -m32 -optflags: parisc %{__global_compiler_flags} -mpa-risc-1-0 -optflags: hppa1.0 %{__global_compiler_flags} -mpa-risc-1-0 -optflags: hppa1.1 %{__global_compiler_flags} -mpa-risc-1-0 -optflags: hppa1.2 %{__global_compiler_flags} -mpa-risc-1-0 -optflags: hppa2.0 %{__global_compiler_flags} -mpa-risc-1-0 - -optflags: mips %{__global_compiler_flags} -march=mips32r2 -mfpxx -optflags: mipsel %{__global_compiler_flags} -march=mips32r2 -mfpxx -optflags: mips64 %{__global_compiler_flags} -march=mips64r2 -mabi=64 -optflags: mips64el %{__global_compiler_flags} -march=mips64r2 -mabi=64 -optflags: mipsr6 %{__global_compiler_flags} -march=mips32r6 -optflags: mipsr6el %{__global_compiler_flags} -march=mips32r6 -optflags: mips64r6 %{__global_compiler_flags} -march=mips64r6 -optflags: mips64r6el %{__global_compiler_flags} -march=mips64r6 - -optflags: armv3l %{__global_compiler_flags} -fsigned-char -march=armv3 -optflags: armv4b %{__global_compiler_flags} -fsigned-char -march=armv4 -optflags: armv4l %{__global_compiler_flags} -fsigned-char -march=armv4 -optflags: armv4tl %{__global_compiler_flags} -march=armv4t -optflags: armv5tel %{__global_compiler_flags} -march=armv5te -mfloat-abi=soft -optflags: armv5tejl %{__global_compiler_flags} -march=armv5te -mfloat-abi=soft -optflags: armv6l %{__global_compiler_flags} -march=armv6 -mfloat-abi=soft -optflags: armv6hl %{__global_compiler_flags} -march=armv6 -mfpu=vfp -mfloat-abi=hard -optflags: armv6hnl %{__global_compiler_flags} -march=armv6 -mfpu=neon -mfloat-abi=hard -optflags: armv7l %{__global_compiler_flags} -march=armv7-a -mfloat-abi=soft +# TODO: Remove armv7hl once f36 goes EOL. optflags: armv7hl %{__global_compiler_flags} -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard -optflags: armv7hnl %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mfloat-abi=hard -optflags: atarist %{__global_compiler_flags} -optflags: atariste %{__global_compiler_flags} -optflags: ataritt %{__global_compiler_flags} -optflags: falcon %{__global_compiler_flags} -optflags: atariclone %{__global_compiler_flags} -optflags: milan %{__global_compiler_flags} -optflags: hades %{__global_compiler_flags} - -optflags: s390 %{__global_compiler_flags} -m31 %{__cflags_arch_s390x} -fasynchronous-unwind-tables optflags: s390x %{__global_compiler_flags} -m64 %{__cflags_arch_s390x} -fasynchronous-unwind-tables -fstack-clash-protection optflags: aarch64 %{__global_compiler_flags} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] @@ -87,11 +27,5 @@ buildarchtranslate: pentium3: i686 buildarchtranslate: i686: i686 buildarchtranslate: i586: i586 -buildarchtranslate: sparcv9: sparcv9 -buildarchtranslate: sparcv9v: sparcv9 - -buildarchtranslate: armv5tejl: armv5tel -buildarchtranslate: armv6l: armv5tel -buildarchtranslate: armv7l: armv5tel buildarchtranslate: armv7hl: armv7hl buildarchtranslate: armv7hnl: armv7hl