From 3e612b63b980f85179a05951af3693267ba974c3 Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Fri, 25 Jun 2004 16:01:38 +0000
Subject: [PATCH] sync

---
 rpmrc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/rpmrc b/rpmrc
index 51eb978..d77fc3f 100644
--- a/rpmrc
+++ b/rpmrc
@@ -1,12 +1,12 @@
 include: /usr/lib/rpm/rpmrc
 
-optflags: i386 %{__global_cflags} -march=i386 -mcpu=i686
-optflags: i486 %{__global_cflags} -march=i486
-optflags: i586 %{__global_cflags} -march=i586
-optflags: i686 %{__global_cflags} -march=i686
-optflags: athlon %{__global_cflags} -march=athlon
+optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=pentium4
+optflags: i486 %{__global_cflags} -m32 -march=i486
+optflags: i586 %{__global_cflags} -m32 -march=i586
+optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=pentium4
+optflags: athlon %{__global_cflags} -m32 -march=athlon
 optflags: ia64 %{__global_cflags}
-optflags: x86_64 %{__global_cflags}
+optflags: x86_64 %{__global_cflags} -m64
 
 optflags: alpha %{__global_cflags} -mieee
 optflags: alphaev5 %{__global_cflags} -mieee -mcpu=ev5
@@ -15,16 +15,16 @@ optflags: alphapca56 %{__global_cflags} -mieee -mcpu=pca56
 optflags: alphaev6 %{__global_cflags} -mieee -mcpu=ev6
 optflags: alphaev67 %{__global_cflags} -mieee -mcpu=ev67
 
-optflags: sparc %{__global_cflags} -m32 -mtune=ultrasparc
+optflags: sparc %{__global_cflags} -m32 -mcpu=v7 -mtune=ultrasparc
 optflags: sparcv9 %{__global_cflags} -m32 -mcpu=ultrasparc
 optflags: sparc64 %{__global_cflags} -m64 -mcpu=ultrasparc
 
 optflags: m68k %{__global_cflags}
 
-optflags: ppc %{__global_cflags} -fsigned-char
-optflags: ppciseries %{__global_cflags} -fsigned-char
-optflags: ppcpseries %{__global_cflags} -fsigned-char
-optflags: ppc64 %{__global_cflags} -fsigned-char -mminimal-toc
+optflags: ppc %{__global_cflags} -m32 -fsigned-char
+optflags: ppciseries %{__global_cflags} -m32 -fsigned-char
+optflags: ppcpseries %{__global_cflags} -m32 -fsigned-char
+optflags: ppc64 %{__global_cflags} -m64 -fsigned-char -mminimal-toc
 
 optflags: parisc %{__global_cflags} -mpa-risc-1-0
 optflags: hppa1.0 %{__global_cflags} -mpa-risc-1-0
@@ -47,8 +47,8 @@ optflags: atariclone %{__global_cflags}
 optflags: milan %{__global_cflags}
 optflags: hades %{__global_cflags}
 
-optflags: s390 %{__global_cflags}
-optflags: s390x %{__global_cflags}
+optflags: s390 %{__global_cflags} -m31
+optflags: s390x %{__global_cflags} -m64
 
 macrofiles:     
 /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/usr/lib/rpm/redhat/macros:/etc/rpm/macros.*:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros