From 4e85fa5fcca3b13ad0103faaffd50213203779d8 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 7 Jan 2008 17:34:01 +0000 Subject: 1.68: do not use ssp_flags on archs which do not handle it (thanks to rtp) --- rpmrc.in | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'rpmrc.in') diff --git a/rpmrc.in b/rpmrc.in index 68e793d..a86a1b7 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -5,18 +5,20 @@ ############################################################# # Values for RPM_OPT_FLAGS for various platforms -optflags: i386 %{__common_cflags} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables -optflags: i486 %{__common_cflags} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables -optflags: k6 %{__common_cflags} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables -optflags: i586 %{__common_cflags} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables -optflags: i686 %{__common_cflags} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables -optflags: athlon %{__common_cflags} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables -optflags: pentium3 %{__common_cflags} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables -optflags: pentium4 %{__common_cflags} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables +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} +optflags: amd64 %{__common_cflags_with_ssp} +optflags: ia32e %{__common_cflags_with_ssp} + optflags: ia64 %{__common_cflags} -optflags: x86_64 %{__common_cflags} -optflags: amd64 %{__common_cflags} -optflags: ia32e %{__common_cflags} # XXX Please note that -mieee has been added in rpm-3.0.5. optflags: alpha %{__common_cflags} -mieee -mcpu=ev5 @@ -32,11 +34,11 @@ optflags: sparc64 %{__common_cflags} -m64 -mcpu=ultrasparc optflags: m68k %{__common_cflags} -fomit-frame-pointer -optflags: ppc %{__common_cflags} -fsigned-char -mcpu=750 -mtune=7450 -optflags: ppciseries %{__common_cflags} -fsigned-char -optflags: ppcpseries %{__common_cflags} -fsigned-char -optflags: ppc32 %{__common_cflags} -m32 -fsigned-char -mcpu=power4 -mtune=cell -optflags: ppc64 %{__common_cflags} -m64 -fsigned-char -mcpu=power4 -mtune=cell +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 @@ -59,8 +61,8 @@ 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} -optflags: s390x %{__common_cflags} +optflags: s390 %{__common_cflags_with_ssp} +optflags: s390x %{__common_cflags_with_ssp} ############################################################# # Canonical arch names and numbers -- cgit v1.2.1