[src/trunk]: src Use MACHINE_CPU for m68k. Use similar logic for both tests.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e364b71f371
branches:  trunk
changeset: 790441:1e364b71f371
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Oct 09 22:33:41 2013 +0000

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

diffstat:

 lib/libpthread/Makefile    |  9 ++++-----
 libexec/ld.elf_so/Makefile |  4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r e199eb89765e -r 1e364b71f371 lib/libpthread/Makefile
--- a/lib/libpthread/Makefile   Wed Oct 09 20:15:39 2013 +0000
+++ b/lib/libpthread/Makefile   Wed Oct 09 22:33:41 2013 +0000
@@ -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 @@
 
 ALIGN_FUNCTIONS=       ${${ACTIVE_CC} == "gcc":? -falign-functions=32 :}
 
-.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000" || \
-    ${MACHINE_CPU} == "sh3" || ${MACHINE_ARCH} == "vax"
+.if ${MACHINE_CPU} != "m68k" && ${MACHINE_CPU} != "sh3" && ${MACHINE_ARCH} != "vax"
+OMIT_FRAME_POINTER=    -fomit-frame-pointer
+.else
 OMIT_FRAME_POINTER=
-.else
-OMIT_FRAME_POINTER=    -fomit-frame-pointer
 .endif
 
 # The TSD routines are used in the implementation of profiling, and so
diff -r e199eb89765e -r 1e364b71f371 libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Wed Oct 09 20:15:39 2013 +0000
+++ b/libexec/ld.elf_so/Makefile        Wed Oct 09 22:33:41 2013 +0000
@@ -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 @@
 #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