From 506961f9da226c3deee328c04c870a3478187727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Tue, 5 Dec 2023 20:24:29 +0200 Subject: rpmrc: drop arches we don't really support --- NEWS | 1 + rpmrc.in | 66 ---------------------------------------------------------------- 2 files changed, 1 insertion(+), 66 deletions(-) diff --git a/NEWS b/NEWS index 66b0510..7197117 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +- rpmrc: drop arches we don't really support - macros: use -Wl,-z,now with -Wl,-z,relro unless _disable_ld_now is defined - mangle script shebangs diff --git a/rpmrc.in b/rpmrc.in index f69ad8f..106d7e1 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -6,58 +6,11 @@ optflags: i386 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables optflags: i486 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables -optflags: k6 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables optflags: i586 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables optflags: i686 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables optflags: athlon %{__common_cflags_with_ssp} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables -optflags: pentium3 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables -optflags: pentium4 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables - optflags: x86_64 %{__common_cflags_with_ssp} -fasynchronous-unwind-tables -optflags: amd64 %{__common_cflags_with_ssp} -optflags: ia32e %{__common_cflags_with_ssp} - -optflags: ia64 %{__common_cflags} - # XXX Please note that -mieee has been added in rpm-3.0.5. -optflags: alpha %{__common_cflags} -mieee -mcpu=ev5 -optflags: alphaev5 %{__common_cflags} -mieee -mcpu=ev5 -optflags: alphaev56 %{__common_cflags} -mieee -mcpu=ev56 -optflags: alphapca56 %{__common_cflags} -mieee -mcpu=pca56 -optflags: alphaev6 %{__common_cflags} -mieee -mcpu=ev6 -optflags: alphaev67 %{__common_cflags} -mieee -mcpu=ev67 - -optflags: sparc %{__common_cflags} -m32 -mtune=ultrasparc -optflags: sparcv9 %{__common_cflags} -m32 -mcpu=ultrasparc -optflags: sparc64 %{__common_cflags} -m64 -mcpu=ultrasparc - -optflags: m68k %{__common_cflags} -fomit-frame-pointer - -optflags: ppc %{__common_cflags_with_ssp} -fsigned-char -mcpu=750 -mtune=7450 -optflags: ppciseries %{__common_cflags_with_ssp} -fsigned-char -optflags: ppcpseries %{__common_cflags_with_ssp} -fsigned-char -optflags: ppc32 %{__common_cflags_with_ssp} -m32 -fsigned-char -mcpu=power4 -mtune=cell -optflags: ppc64 %{__common_cflags_with_ssp} -m64 -fsigned-char -mcpu=power4 -mtune=cell - -optflags: parisc %{__common_cflags} -mpa-risc-1-0 -optflags: hppa1.0 %{__common_cflags} -mpa-risc-1-0 -optflags: hppa1.1 %{__common_cflags} -mpa-risc-1-0 -optflags: hppa1.2 %{__common_cflags} -mpa-risc-1-0 -optflags: hppa2.0 %{__common_cflags} -mpa-risc-1-0 - -optflags: mips %{__common_cflags} -march=mips3 -optflags: mipsel %{__common_cflags} -march=mips3 -optflags: mips32el %{__common_cflags} -march=mips3 -mabi=n32 -optflags: mips64el %{__common_cflags} -march=mips3 -mabi=64 - -optflags: armv3l %{__common_cflags_with_ssp} -march=armv3 -optflags: armv4b %{__common_cflags_with_ssp} -march=armv4 -optflags: armv4l %{__common_cflags_with_ssp} -march=armv4 -optflags: armv4t %{__common_cflags_with_ssp} -march=armv4t -optflags: armv4tl %{__common_cflags_with_ssp} -march=armv4t -optflags: armv5t %{__common_cflags_with_ssp} -march=armv5t -optflags: armv5tl %{__common_cflags_with_ssp} -march=armv5t - # Cortex A8 optflags: armv7 %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp optflags: armv7l %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp @@ -67,17 +20,6 @@ optflags: armv7hnl %{__common_cflags_with_ssp} -march=armv7-a -mfloat-abi=hard - optflags: aarch64 %{__common_cflags_with_ssp} -fasynchronous-unwind-tables -optflags: atarist %{__common_cflags} -fomit-frame-pointer -optflags: atariste %{__common_cflags} -fomit-frame-pointer -optflags: ataritt %{__common_cflags} -fomit-frame-pointer -optflags: falcon %{__common_cflags} -fomit-frame-pointer -optflags: atariclone %{__common_cflags} -fomit-frame-pointer -optflags: milan %{__common_cflags} -fomit-frame-pointer -optflags: hades %{__common_cflags} -fomit-frame-pointer - -optflags: s390 %{__common_cflags_with_ssp} -optflags: s390x %{__common_cflags_with_ssp} - ############################################################# # Canonical arch names and numbers @@ -96,14 +38,10 @@ buildarchtranslate: athlon: i586 buildarchtranslate: pentium4: i586 buildarchtranslate: pentium3: i586 buildarchtranslate: i686: i586 -buildarchtranslate: k6: i586 buildarchtranslate: i586: i586 buildarchtranslate: i486: i486 buildarchtranslate: i386: i386 -buildarchtranslate: i386: i386 -buildarchtranslate: armv5tel: armv5tl -buildarchtranslate: armv5t: armv5t buildarchtranslate: armv7: armv5t buildarchtranslate: armv7l: @ARMV7CANONTARGETCPU@ buildarchtranslate: armv7hl: armv7hl @@ -116,13 +54,9 @@ buildarchtranslate: armv8hcnl: @ARMV8CANONTARGETCPU@ ############################################################# # Architecture compatibility -arch_compat: k6: i586 - arch_compat: osfmach3_i686: i686 osfmach3_i586 arch_compat: osfmach3_i586: i586 osfmach3_i486 arch_compat: osfmach3_i486: i486 osfmach3_i386 arch_compat: osfmach3_i386: i486 arch_compat: armv8l: armv7hl - -buildarch_compat: k6: i486 -- cgit v1.2.1