Index: Makefile.cmachflags
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/Makefile.cmachflags,v
retrieving revision 1.1
diff -p -r1.1 Makefile.cmachflags
*** Makefile.cmachflags	25 Jan 2009 22:25:08 -0000	1.1
--- Makefile.cmachflags	6 Jul 2010 02:14:20 -0000
***************
*** 1,7 ****
  #	$NetBSD: Makefile.cmachflags,v 1.1 2009/01/25 22:25:08 abs Exp $
  
  # Set CMACHFLAGS best target the specific CPU combination, based on
! # -DM68020, -DM68030, -DM68040, and -DM68060
  
  # This should typically be included iff the config file has not already set
  # CMACHFLAGS, eg:
--- 1,7 ----
  #	$NetBSD: Makefile.cmachflags,v 1.1 2009/01/25 22:25:08 abs Exp $
  
  # Set CMACHFLAGS best target the specific CPU combination, based on
! # their "options" setting.
  
  # This should typically be included iff the config file has not already set
  # CMACHFLAGS, eg:
***************
*** 31,49 ****
  # 030             -m68030
  # 020             -m68020
  
! .if !empty(IDENT:M-DM68060)
! .if empty(IDENT:M-DM68020) && empty(IDENT:M-DM68030) && empty(IDENT:M-DM68040)
! CMACHFLAGS=	-m68060
! .else
  CMACHFLAGS=	-m68020-60
! .endif
! .elif !empty(IDENT:M-DM68040)
! .if empty(IDENT:M-DM68020) && empty(IDENT:M-DM68030)
! CMACHFLAGS=	-m68040
! .else /* !-DM68060 */
  CMACHFLAGS=	-m68020-40
! .endif
! .elif !empty(IDENT:M-DM68020)
  CMACHFLAGS=	-m68020
  .else
  CMACHFLAGS=	-m68030
--- 31,54 ----
  # 030             -m68030
  # 020             -m68020
  
! HAVE_M68020!=	grep '\#define[ 	]*M68020' opt_m68k_arch.h 2>/dev/null || echo no
! HAVE_M68030!=	grep '\#define[ 	]*M68030' opt_m68k_arch.h 2>/dev/null || echo no
! HAVE_M68040!=	grep '\#define[ 	]*M68040' opt_m68k_arch.h 2>/dev/null || echo no
! HAVE_M68060!=	grep '\#define[ 	]*M68060' opt_m68k_arch.h 2>/dev/null || echo no
! 
! .if ${HAVE_M68060} != "no"
! . if ${HAVE_M68020} != "no" || ${HAVE_M68030} != "no" || ${HAVE_M68040} != "no"
  CMACHFLAGS=	-m68020-60
! . else
! CMACHFLAGS=	-m68060
! . endif
! .elif ${HAVE_M68040} != "no"
! . if ${HAVE_M68020} != "no" || ${HAVE_M68030} != "no"
  CMACHFLAGS=	-m68020-40
! . else /* !-DM68060 */
! CMACHFLAGS=	-m68040
! . endif
! .elif ${HAVE_M68020} != "no"
  CMACHFLAGS=	-m68020
  .else
  CMACHFLAGS=	-m68030