--- rpm-4.4.7.orig/rpmrc.in	2006-08-06 15:13:38.000000000 +0000
+++ rpm-4.4.7/rpmrc.in	2007-12-14 02:59:17.000000000 +0000
@@ -15,13 +15,13 @@
 # "fat" binary with both archs, for Darwin
 optflags: fat -O2 -g -arch i386 -arch ppc
 
-optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
-optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables
-optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables
-optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
-optflags: pentium3 -O2 -g -m32 -march=pentium3 -fasynchronous-unwind-tables
-optflags: pentium4 -O2 -g -m32 -march=pentium4 -fasynchronous-unwind-tables
-optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables
+optflags: i386 -O2 -g -fomit-frame-pointer -pipe -march=i386
+optflags: i486 -O2 -g -fomit-frame-pointer -pipe -march=i486
+optflags: i586 -O2 -g -fomit-frame-pointer -pipe -march=i586 -mtune=generic
+optflags: i686 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=generic
+optflags: pentium3 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=pentium3
+optflags: pentium4 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=pentium4
+optflags: athlon -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=athlon
 optflags: ia64 -O2 -g
 optflags: x86_64 -O2 -g -m64 -mtune=generic
 optflags: amd64 -O2 -g -m64 -mtune=generic
@@ -192,11 +192,11 @@
 buildarchtranslate: osfmach3_i486: i386
 buildarchtranslate: osfmach3_i386: i386
 
-buildarchtranslate: athlon: i386
-buildarchtranslate: pentium4: i386
-buildarchtranslate: pentium3: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
+buildarchtranslate: athlon: i586
+buildarchtranslate: pentium4: i586
+buildarchtranslate: pentium3: i586
+buildarchtranslate: i686: i586
+buildarchtranslate: i586: i586
 buildarchtranslate: i486: i386
 buildarchtranslate: i386: i386