--- misc/config/cc/gcc
+++ misc/config/cc/gcc
@@ -34,7 +34,7 @@
 
 <mach_opt>
 # Specializations first (they don't need to be, just clearer)
-i386           -> "-mcpu=i686 -momit-leaf-frame-pointer"
+i386           -> "-momit-leaf-frame-pointer"
 r10000         -> "-mips4"
 alpha-ev67     -> "-mcpu=ev6" # FIXME: GCC 3.1 and on has -march=ev67
 alpha-ev68     -> "-mcpu=ev6"
@@ -51,8 +51,8 @@
 alpha     -> "-mcpu=SUBMODEL" alpha-
 amd64     -> "-momit-leaf-frame-pointer"
 arm       -> "-mcpu=SUBMODEL"
-ia32      -> "-march=SUBMODEL -momit-leaf-frame-pointer"
-ia64      -> "-mtune=SUBMODEL"
+ia32      -> "-momit-leaf-frame-pointer"
+ia64      -> ""
 hppa      -> "-march=SUBMODEL" hppa
 m68k      -> "-mSUBMODEL"
 sh        -> "-mSUBMODEL" sh
@@ -60,17 +60,17 @@
 sparc64   -> "-mcpu=v9 -mtune=ultrasparc"
 mips32    -> "-mips1 -mcpu=SUBMODEL" mips32-
 mips64    -> "-mips3 -mcpu=SUBMODEL" mips64-
-ppc       -> "-mcpu=SUBMODEL" ppc
-ppc64     -> "-mcpu=SUBMODEL" ppc
+ppc       -> ppc
+ppc64     -> ppc
 </mach_opt>
 
 # Note that the 'linking' bit means "use this for both compiling *and* linking"
 <mach_abi_linking>
-amd64   -> "-m64"
+amd64   -> ""
 mips32  -> "-mabi=n32"
 mips64  -> "-mabi=64"
-s390    -> "-m31"
-s390x   -> "-m64"
+s390    -> ""
+s390x   -> ""
 sparc32 -> "-m32 -mno-app-regs"
 sparc64 -> "-m64 -mno-app-regs"
 ppc64   -> "-m64"