Defaulting to march=i486 in the compiler doesn't help much if the driver

overrides that setting.  Sync both to use i486.  Fixes libreoffice and chromium
on i386, tested by both me and naddy@.

lang/gcc/4.6/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2012/04/02 15:28:04 pascal Exp $
+# $OpenBSD: Makefile,v 1.22 2012/04/09 11:55:53 pascal Exp $
 
 ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
 
@@ -18,14 +18,14 @@ PKGNAME-objc =  gobjc-${FULL_PKGVERSION}
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =	gccgo-${FULL_PKGVERSION}
 
-REVISION-main = 0
-REVISION-c++ = 0
-REVISION-estdc = 0
-REVISION-f95 = 0
-REVISION-java = 0
-REVISION-objc = 0
-REVISION-ada = 0
-REVISION-go = 0
+REVISION-main = 1
+REVISION-c++ = 1
+REVISION-estdc = 1
+REVISION-f95 = 1
+REVISION-java = 1
+REVISION-objc = 1
+REVISION-ada = 1
+REVISION-go = 1
 
 SHARED_LIBS =	estdc++		14.0 \
 		gfortran	3.0 \

lang/gcc/4.6/patches/patch-gcc_config_gcc

@@ -1,6 +1,6 @@
-$OpenBSD: patch-gcc_config_gcc,v 1.2 2012/03/07 20:39:37 kurt Exp $
---- gcc/config.gcc.orig	Fri Jul 22 12:44:50 2011
-+++ gcc/config.gcc	Tue Feb 28 16:32:08 2012
+$OpenBSD: patch-gcc_config_gcc,v 1.3 2012/04/09 11:55:53 pascal Exp $
+--- gcc/config.gcc.orig	Fri Jul 22 18:44:50 2011
++++ gcc/config.gcc	Mon Apr  9 01:34:39 2012
 @@ -668,6 +668,14 @@ case ${target} in
      *-*-openbsd2.*|*-*-openbsd3.[012])
        tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
@@ -44,3 +44,16 @@ $OpenBSD: patch-gcc_config_gcc,v 1.2 2012/03/07 20:39:37 kurt Exp $
  powerpc-*-darwin*)
  	extra_options="${extra_options} rs6000/darwin.opt"
  	extra_parts="crt2.o"
+@@ -2821,6 +2835,12 @@ case ${target} in
+     else
+       arch=i386
+     fi
++    cpu=generic
++    arch_without_sse2=yes
++    arch_without_64bit=yes
++    ;;
++  i386-*-openbsd*)
++    arch=i486
+     cpu=generic
+     arch_without_sse2=yes
+     arch_without_64bit=yes