Use MACHINE_CPU for m68k. Use similar logic for both tests.

This commit is contained in:
matt 2013-10-09 22:33:41 +00:00
parent eaca448335
commit fa741d8823
2 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.82 2013/08/15 22:38:24 matt Exp $
# $NetBSD: Makefile,v 1.83 2013/10/09 22:33:41 matt Exp $
#
WARNS?= 5
@ -78,11 +78,10 @@ SRCS+= pthread_compat.c
ALIGN_FUNCTIONS= ${${ACTIVE_CC} == "gcc":? -falign-functions=32 :}
.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000" || \
${MACHINE_CPU} == "sh3" || ${MACHINE_ARCH} == "vax"
OMIT_FRAME_POINTER=
.else
.if ${MACHINE_CPU} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax"
OMIT_FRAME_POINTER= -fomit-frame-pointer
.else
OMIT_FRAME_POINTER=
.endif
# The TSD routines are used in the implementation of profiling, and so

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.122 2013/08/12 17:15:46 joerg Exp $
# $NetBSD: Makefile,v 1.123 2013/10/09 22:33:41 matt Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@ -100,7 +100,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libexecinfo
#DBG= -g
COPTS+= -O3
.if ${MACHINE_ARCH} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax"
.if ${MACHINE_CPU} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax"
COPTS+= -fomit-frame-pointer
.endif