Module Name: src
Committed By: matt
Date: Wed Oct 9 22:33:41 UTC 2013
Modified Files:
src/lib/libpthread: Makefile
src/libexec/ld.elf_so: Makefile
Log Message:
Use MACHINE_CPU for m68k. Use similar logic for both tests.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/lib/libpthread/Makefile
cvs rdiff -u -r1.122 -r1.123 src/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.82 src/lib/libpthread/Makefile:1.83
--- src/lib/libpthread/Makefile:1.82 Thu Aug 15 22:38:24 2013
+++ src/lib/libpthread/Makefile Wed Oct 9 22:33:41 2013
@@ -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
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.122 src/libexec/ld.elf_so/Makefile:1.123
--- src/libexec/ld.elf_so/Makefile:1.122 Mon Aug 12 17:15:46 2013
+++ src/libexec/ld.elf_so/Makefile Wed Oct 9 22:33:41 2013
@@ -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/libexec
#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
