$OpenBSD$
--- src/build-data/cc/gcc.orig	Thu Jul 23 20:03:05 2009
+++ src/build-data/cc/gcc	Tue Aug 18 15:23:02 2009
@@ -40,7 +40,7 @@ beos    -> "ld -shared -h $(SONAME)"
 
 <mach_opt>
 # Specializations first (they don't need to be, just clearer)
-i386           -> "-mtune=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"
@@ -82,7 +82,7 @@ sparc64 -> "-m64 -mno-app-regs"
 ppc64   -> "-m64"
 
 # This should probably be used on most/all targets, but the docs are incomplete
-openbsd -> "-pthread"
+openbsd -> "-pthread $(CFLAGS)"
 freebsd -> "-pthread"
 netbsd  -> "-pthread -D_NETBSD_SOURCE"
 qnx     -> "-fexceptions -D_QNX_SOURCE"
