Index: share/mk/bsd.sys.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.sys.mk,v
retrieving revision 1.207
diff -p -r1.207 bsd.sys.mk
*** share/mk/bsd.sys.mk	8 Jul 2011 20:59:53 -0000	1.207
--- share/mk/bsd.sys.mk	10 Jul 2011 22:30:21 -0000
*************** CFLAGS+=	-Wsign-compare
*** 64,71 ****
  CFLAGS+=	${${ACTIVE_CC} == "clang":? -Wpointer-sign :}
  .endif
  .if (defined(HAVE_GCC) && ${HAVE_GCC} == 45 \
!      && (${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"))
! # XXX GCC 4.5 for sh3 (which we compile with -Os) is extra noisy for
  # cases it should be better with
  CFLAGS+=	-Wno-uninitialized
  .endif
--- 64,73 ----
  CFLAGS+=	${${ACTIVE_CC} == "clang":? -Wpointer-sign :}
  .endif
  .if (defined(HAVE_GCC) && ${HAVE_GCC} == 45 \
!      && (${MACHINE_ARCH} == "sh3eb" || \
! 	 ${MACHINE_ARCH} == "sh3el" || \
! 	 ${MACHINE_ARCH} == "m68k"))
! # XXX GCC 4.5 for sh3/m68k (which we compile with -Os) is extra noisy for
  # cases it should be better with
  CFLAGS+=	-Wno-uninitialized
  .endif
Index: share/mk/sys.mk
===================================================================
RCS file: /cvsroot/src/share/mk/sys.mk,v
retrieving revision 1.106
diff -p -r1.106 sys.mk
*** share/mk/sys.mk	20 May 2011 14:27:48 -0000	1.106
--- share/mk/sys.mk	10 Jul 2011 22:30:21 -0000
*************** CC?=		cc
*** 26,38 ****
      ${MACHINE_ARCH} == "armeb" || \
      ${MACHINE_ARCH} == "hppa" || \
      ${MACHINE_ARCH} == "i386" || \
-     ${MACHINE_ARCH} == "m68k" || \
      ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
      ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb" || \
      ${MACHINE_ARCH} == "powerpc" || \
      ${MACHINE_ARCH} == "sparc" || \
      ${MACHINE_ARCH} == "sparc64"
  DBG?=	-O2
  .elif ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
  # -O2 is too -falign-* zealous for low-memory sh3 machines
  DBG?=	-Os -freorder-blocks
--- 26,39 ----
      ${MACHINE_ARCH} == "armeb" || \
      ${MACHINE_ARCH} == "hppa" || \
      ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
      ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb" || \
      ${MACHINE_ARCH} == "powerpc" || \
      ${MACHINE_ARCH} == "sparc" || \
      ${MACHINE_ARCH} == "sparc64"
  DBG?=	-O2
+ .elif ${MACHINE_ARCH} == "m68k"
+ DBG?=	-Os
  .elif ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
  # -O2 is too -falign-* zealous for low-memory sh3 machines
  DBG?=	-Os -freorder-blocks