Module Name: src
Committed By: matt
Date: Wed Dec 18 18:43:30 UTC 2013
Modified Files:
src/gnu/usr.bin/binutils [matt-nb5-mips64]: Makefile Makefile.inc
src/gnu/usr.bin/binutils/common [matt-nb5-mips64]: Makefile
Makefile.inc Makefile.prog
src/gnu/usr.bin/binutils/gas [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/binutils/gprof [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/binutils/ld [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6 [matt-nb5-mips64]: Makefile.inc
src/gnu/usr.bin/gdb6/bfd [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/gdb [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/gdbtui [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/libgdb [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/libiberty [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/opcodes [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/readline [matt-nb5-mips64]: Makefile
src/gnu/usr.bin/gdb6/sim [matt-nb5-mips64]: Makefile
src/gnu/usr.sbin/dbsym [matt-nb5-mips64]: Makefile
src/gnu/usr.sbin/mdsetimage [matt-nb5-mips64]: Makefile
Log Message:
Treat MACHINE_ARCH of armv7/armv7eb as arm/armeb
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.44.1 src/gnu/usr.bin/binutils/Makefile
cvs rdiff -u -r1.14 -r1.14.38.1 src/gnu/usr.bin/binutils/Makefile.inc
cvs rdiff -u -r1.16.44.1 -r1.16.44.2 src/gnu/usr.bin/binutils/common/Makefile
cvs rdiff -u -r1.2 -r1.2.44.1 src/gnu/usr.bin/binutils/common/Makefile.inc
cvs rdiff -u -r1.8 -r1.8.30.1 src/gnu/usr.bin/binutils/common/Makefile.prog
cvs rdiff -u -r1.8 -r1.8.30.1 src/gnu/usr.bin/binutils/gas/Makefile
cvs rdiff -u -r1.5 -r1.5.44.1 src/gnu/usr.bin/binutils/gprof/Makefile
cvs rdiff -u -r1.27.2.3.4.1 -r1.27.2.3.4.2 \
src/gnu/usr.bin/binutils/ld/Makefile
cvs rdiff -u -r1.1 -r1.1.32.1 src/gnu/usr.bin/gdb6/Makefile.inc
cvs rdiff -u -r1.4 -r1.4.8.1 src/gnu/usr.bin/gdb6/bfd/Makefile
cvs rdiff -u -r1.7 -r1.7.24.1 src/gnu/usr.bin/gdb6/gdb/Makefile
cvs rdiff -u -r1.3 -r1.3.24.1 src/gnu/usr.bin/gdb6/gdbtui/Makefile
cvs rdiff -u -r1.8 -r1.8.12.1 src/gnu/usr.bin/gdb6/libgdb/Makefile
cvs rdiff -u -r1.5 -r1.5.12.1 src/gnu/usr.bin/gdb6/libiberty/Makefile
cvs rdiff -u -r1.3 -r1.3.12.1 src/gnu/usr.bin/gdb6/opcodes/Makefile
cvs rdiff -u -r1.3 -r1.3.12.1 src/gnu/usr.bin/gdb6/readline/Makefile
cvs rdiff -u -r1.3 -r1.3.30.1 src/gnu/usr.bin/gdb6/sim/Makefile
cvs rdiff -u -r1.13 -r1.13.44.1 src/gnu/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.19 -r1.19.16.1 src/gnu/usr.sbin/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/binutils/Makefile
diff -u src/gnu/usr.bin/binutils/Makefile:1.22 src/gnu/usr.bin/binutils/Makefile:1.22.44.1
--- src/gnu/usr.bin/binutils/Makefile:1.22 Thu Dec 4 09:29:33 2003
+++ src/gnu/usr.bin/binutils/Makefile Wed Dec 18 18:43:29 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2003/12/04 09:29:33 mrg Exp $
+# $NetBSD: Makefile,v 1.22.44.1 2013/12/18 18:43:29 matt Exp $
.include <bsd.own.mk>
+.include "Makefile.inc"
-.if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
-.include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
+.if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${BFD_MACHINE_ARCH}/defs.mk)
+.include "${.CURDIR}/common/arch/${BFD_MACHINE_ARCH}/defs.mk"
#SUBDIR= libopcodes libbfd libiberty .WAIT
Index: src/gnu/usr.bin/binutils/Makefile.inc
diff -u src/gnu/usr.bin/binutils/Makefile.inc:1.14 src/gnu/usr.bin/binutils/Makefile.inc:1.14.38.1
--- src/gnu/usr.bin/binutils/Makefile.inc:1.14 Sun Dec 12 12:43:05 2004
+++ src/gnu/usr.bin/binutils/Makefile.inc Wed Dec 18 18:43:29 2013
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile.inc,v 1.14 2004/12/12 12:43:05 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.14.38.1 2013/12/18 18:43:29 matt Exp $
.if !defined(__MAKEFILE_INC_INCLUDED__)
__MAKEFILE_INC_INCLUDED__=1
.include <bsd.own.mk>
+BFD_MACHINE_ARCH?=${MACHINE_ARCH:S/armv7/arm/}
+
GNUHOSTDIST= ${DIST}
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
- -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} \
+ -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BFD_MACHINE_ARCH} \
-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
-DLOCALEDIR=\"${LOCALEDIR}\"
Index: src/gnu/usr.bin/binutils/common/Makefile
diff -u src/gnu/usr.bin/binutils/common/Makefile:1.16.44.1 src/gnu/usr.bin/binutils/common/Makefile:1.16.44.2
--- src/gnu/usr.bin/binutils/common/Makefile:1.16.44.1 Wed Apr 21 05:25:48 2010
+++ src/gnu/usr.bin/binutils/common/Makefile Wed Dec 18 18:43:29 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16.44.1 2010/04/21 05:25:48 matt Exp $
+# $NetBSD: Makefile,v 1.16.44.2 2013/12/18 18:43:29 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/gnu
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
TEXINFO= ${G_TEXINFOS}
INFOFLAGS= -I${DIST}/binutils/doc -I{.CURDIR}
@@ -14,7 +14,7 @@ INFOFLAGS= -I${DIST}/binutils/doc -I{.CU
${TEXINFO}: config.texi
-config.texi: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
+config.texi: ${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
${_MKTARGET_CREATE}
rm -f config.texi
echo "@set VERSION ${G_VERSION}" > config.texi
Index: src/gnu/usr.bin/binutils/common/Makefile.inc
diff -u src/gnu/usr.bin/binutils/common/Makefile.inc:1.2 src/gnu/usr.bin/binutils/common/Makefile.inc:1.2.44.1
--- src/gnu/usr.bin/binutils/common/Makefile.inc:1.2 Thu Dec 4 09:29:33 2003
+++ src/gnu/usr.bin/binutils/common/Makefile.inc Wed Dec 18 18:43:29 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.2 2003/12/04 09:29:33 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2.44.1 2013/12/18 18:43:29 matt Exp $
.if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
__COMMON_MAKEFILE_INC_INCLUDED__=1
DIST= ${.CURDIR}/../../../dist/binutils
BFDSUBDIR= lib
+BFD_MACHINE_ARCH=${MACHINE_ARCH:S/armv7/arm/}
.endif
Index: src/gnu/usr.bin/binutils/common/Makefile.prog
diff -u src/gnu/usr.bin/binutils/common/Makefile.prog:1.8 src/gnu/usr.bin/binutils/common/Makefile.prog:1.8.30.1
--- src/gnu/usr.bin/binutils/common/Makefile.prog:1.8 Thu Oct 5 20:40:12 2006
+++ src/gnu/usr.bin/binutils/common/Makefile.prog Wed Dec 18 18:43:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.8 2006/10/05 20:40:12 plunky Exp $
+# $NetBSD: Makefile.prog,v 1.8.30.1 2013/12/18 18:43:29 matt Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -8,7 +8,7 @@
TOP= ${NETBSDSRCDIR}/gnu
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/../common/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../common/arch/${BFD_MACHINE_ARCH}/defs.mk"
# Might end in "-new" in GNU makefile
XPROG= ${PROG:c++filt=cxxfilt}
@@ -18,7 +18,7 @@ SRCS= ${G_${BUPROG}_OBJECTS:.o=.c} \
${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
MAN= ${G_man_MANS:M${PROG}.1}
-CPPFLAGS+= -I${.CURDIR}/../common/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/../common/arch/${BFD_MACHINE_ARCH}
LDADD= -lintl
DPADD= ${LIBINTL}
Index: src/gnu/usr.bin/binutils/gas/Makefile
diff -u src/gnu/usr.bin/binutils/gas/Makefile:1.8 src/gnu/usr.bin/binutils/gas/Makefile:1.8.30.1
--- src/gnu/usr.bin/binutils/gas/Makefile:1.8 Thu Nov 9 21:27:58 2006
+++ src/gnu/usr.bin/binutils/gas/Makefile Wed Dec 18 18:43:29 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2006/11/09 21:27:58 christos Exp $
+# $NetBSD: Makefile,v 1.8.30.1 2013/12/18 18:43:29 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/gnu
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
PROG= as
SRCS= ${G_OBJS:Nitbl-[pl]*:Nm68k-parse.o:.o=.c} \
@@ -20,7 +20,7 @@ COPTS.symbols.c = -Wno-stack-protector
COPTS.stabs.c = -Wno-stack-protector
COPTS.macro.c = -Wno-stack-protector
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH}
CPPFLAGS+= -I${DIST}/gas -I${DIST}/gas/config
CPPFLAGS+= -I${DIST}
Index: src/gnu/usr.bin/binutils/gprof/Makefile
diff -u src/gnu/usr.bin/binutils/gprof/Makefile:1.5 src/gnu/usr.bin/binutils/gprof/Makefile:1.5.44.1
--- src/gnu/usr.bin/binutils/gprof/Makefile:1.5 Fri Nov 28 05:14:18 2003
+++ src/gnu/usr.bin/binutils/gprof/Makefile Wed Dec 18 18:43:29 2013
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2003/11/28 05:14:18 simonb Exp $
+# $NetBSD: Makefile,v 1.5.44.1 2013/12/18 18:43:29 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/gnu
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH}
LDADD= -lintl
DPADD= ${LIBINTL}
Index: src/gnu/usr.bin/binutils/ld/Makefile
diff -u src/gnu/usr.bin/binutils/ld/Makefile:1.27.2.3.4.1 src/gnu/usr.bin/binutils/ld/Makefile:1.27.2.3.4.2
--- src/gnu/usr.bin/binutils/ld/Makefile:1.27.2.3.4.1 Mon Dec 14 06:28:08 2009
+++ src/gnu/usr.bin/binutils/ld/Makefile Wed Dec 18 18:43:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27.2.3.4.1 2009/12/14 06:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.27.2.3.4.2 2013/12/18 18:43:29 matt Exp $
.include <bsd.own.mk>
@@ -7,13 +7,13 @@ SUBDIR= xldscripts
TOP= ${NETBSDSRCDIR}/gnu
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
SCRIPTSDIR= /usr/libdata
PROG= ld
SRCS= ${G_OFILES:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH} \
-I${DIST}/ld \
-DDEFAULT_EMULATION=\"${G_EMUL}\" \
-DSCRIPTDIR=\"${SCRIPTSDIR}\" \
@@ -76,15 +76,15 @@ CLEANFILES+= .depend.${f} e${f}.c
# XXX super hack
EMUL_LIB_PATH.${f}:=/usr/lib
-. if ${MACHINE_ARCH} == "x86_64"
+. if ${BFD_MACHINE_ARCH} == "x86_64"
. if "${f}" == "elf_i386" || "${f}" == "i386nbsd"
EMUL_LIB_PATH.${f}:=/usr/lib/i386
. endif
-. elif ${MACHINE_ARCH} == "sparc64"
+. elif ${BFD_MACHINE_ARCH} == "sparc64"
. if "${f}" == "elf32_sparc" || "${f}" == "sparcnbsd"
EMUL_LIB_PATH.${f}:=/usr/lib/sparc
. endif
-. elif ${MACHINE_ARCH} == "mips64el"
+. elif ${BFD_MACHINE_ARCH} == "mips64el"
. if "${f}" == "elf32ltsmip" || "${f}" == "elf32btsmip"
EMUL_LIB_PATH.${f}:=/usr/lib/o32
. elif "${f}" == "elf64btsmip" || "${f}" == "elf64btsmip"
@@ -100,8 +100,8 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CUR
${G_target_alias} ${G_target_alias} ${G_target_alias} \
${G_EMUL} ${LIBDIR} yes ${f} "${G_target_alias}"
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${BFD_MACHINE_ARCH} == "x86_64" || ${BFD_MACHINE_ARCH} == "sparc64" || \
+ ${BFD_MACHINE_ARCH} == "mips64el" || ${BFD_MACHINE_ARCH} == "mips64eb"
FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
# XXX hack to find out if .xs/.xc exists - slow!
@@ -111,7 +111,7 @@ HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' $
.if !empty(HAS_XS)
FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
# only do this if we don't have GENERATE_SHLIB_SCRIPT
-.elif ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.elif ${BFD_MACHINE_ARCH} == "mips64el" || ${BFD_MACHINE_ARCH} == "mips64eb"
FILES+= ${f}.xc ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
.endif
.endif # x64_64 || sparc64
Index: src/gnu/usr.bin/gdb6/Makefile.inc
diff -u src/gnu/usr.bin/gdb6/Makefile.inc:1.1 src/gnu/usr.bin/gdb6/Makefile.inc:1.1.32.1
--- src/gnu/usr.bin/gdb6/Makefile.inc:1.1 Mon May 15 16:31:37 2006
+++ src/gnu/usr.bin/gdb6/Makefile.inc Wed Dec 18 18:43:29 2013
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.1 2006/05/15 16:31:37 nathanw Exp $
+# $NetBSD: Makefile.inc,v 1.1.32.1 2013/12/18 18:43:29 matt Exp $
USE_LIBEDIT=no
USE_TUI=yes
+
+GDB_MACHINE_ARCH=${MACHINE_ARCH:S/armv7/arm/}
Index: src/gnu/usr.bin/gdb6/bfd/Makefile
diff -u src/gnu/usr.bin/gdb6/bfd/Makefile:1.4 src/gnu/usr.bin/gdb6/bfd/Makefile:1.4.8.1
--- src/gnu/usr.bin/gdb6/bfd/Makefile:1.4 Sat Oct 25 22:27:35 2008
+++ src/gnu/usr.bin/gdb6/bfd/Makefile Wed Dec 18 18:43:30 2013
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
+.include "../Makefile.inc"
+
LIBISPRIVATE= yes
LIB= bfd
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gdb6
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} -I${DIST}/include -I. \
+CPPFLAGS+= -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} -I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
Index: src/gnu/usr.bin/gdb6/gdb/Makefile
diff -u src/gnu/usr.bin/gdb6/gdb/Makefile:1.7 src/gnu/usr.bin/gdb6/gdb/Makefile:1.7.24.1
--- src/gnu/usr.bin/gdb6/gdb/Makefile:1.7 Mon Feb 19 18:26:22 2007
+++ src/gnu/usr.bin/gdb6/gdb/Makefile Wed Dec 18 18:43:30 2013
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2007/02/19 18:26:22 chs Exp $
+# $NetBSD: Makefile,v 1.7.24.1 2013/12/18 18:43:30 matt Exp $
.include "../Makefile.inc"
TOP= ${NETBSDSRCDIR}/gnu
DIST= ${TOP}/dist/gdb6
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../arch/${GDB_MACHINE_ARCH}/defs.mk"
PROG= gdb
SRCS= gdb.c
CPPFLAGS= -I${.CURDIR} \
- -I${.CURDIR}/../arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../arch/${GDB_MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
-I${DIST}/include/opcode \
-I${DIST} \
- -I${.CURDIR}/../bfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../bfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
${GCPPFLAGS:M-D*}
@@ -46,8 +46,8 @@ LDADD+= -L${LIBGDBDIR} -lgdb
DPADD+= ${LIBGDBDIR}/libgdb.a
# Simulator support
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpcle || \
- ${MACHINE_ARCH} == powerpc64
+.if ${GDB_MACHINE_ARCH} == powerpc || ${GDB_MACHINE_ARCH} == powerpcle || \
+ ${GDB_MACHINE_ARCH} == powerpc64
SIMOBJ!= cd ${.CURDIR}/../sim/ppc && ${PRINTOBJDIR}
LDADD+= -L${SIMOBJ} -lsim
DPADD+= ${SIMOBJ}/libsim.a
@@ -79,4 +79,4 @@ LDADD+= -lpthread_dbg
.include <bsd.prog.mk>
.PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
- ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${MACHINE_ARCH}
+ ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}
Index: src/gnu/usr.bin/gdb6/gdbtui/Makefile
diff -u src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.3 src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.3.24.1
--- src/gnu/usr.bin/gdb6/gdbtui/Makefile:1.3 Mon Feb 19 18:26:22 2007
+++ src/gnu/usr.bin/gdb6/gdbtui/Makefile Wed Dec 18 18:43:30 2013
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 18:26:22 chs Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2013/12/18 18:43:30 matt Exp $
.include "../Makefile.inc"
TOP= ${NETBSDSRCDIR}/gnu
DIST= ${TOP}/dist/gdb6
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../arch/${GDB_MACHINE_ARCH}/defs.mk"
PROG= gdbtui
SRCS= tui-main.c
CPPFLAGS= -I${.CURDIR} \
- -I${.CURDIR}/../arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../arch/${GDB_MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
-I${DIST}/include/opcode \
-I${DIST} \
- -I${.CURDIR}/../bfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../bfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
${GCPPFLAGS:M-D*}
@@ -45,7 +45,7 @@ LDADD+= -L${LIBGDBDIR} -lgdb
DPADD+= ${LIBGDBDIR}/libgdb.a
# Simulator support
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpcle
+.if ${GDB_MACHINE_ARCH} == powerpc || ${GDB_MACHINE_ARCH} == powerpcle
SIMOBJ!= cd ${.CURDIR}/../sim/ppc && ${PRINTOBJDIR}
LDADD+= -L${SIMOBJ} -lsim
DPADD+= ${SIMOBJ}/libsim.a
@@ -75,4 +75,4 @@ LDADD+= -lpthread_dbg
.endif
.PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
- ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${MACHINE_ARCH}
+ ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}
Index: src/gnu/usr.bin/gdb6/libgdb/Makefile
diff -u src/gnu/usr.bin/gdb6/libgdb/Makefile:1.8 src/gnu/usr.bin/gdb6/libgdb/Makefile:1.8.12.1
--- src/gnu/usr.bin/gdb6/libgdb/Makefile:1.8 Sat May 3 14:48:31 2008
+++ src/gnu/usr.bin/gdb6/libgdb/Makefile Wed Dec 18 18:43:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.8.12.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
@@ -7,19 +7,19 @@
LIBISPRIVATE= yes
LIB= gdb
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../arch/${GDB_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gdb6
SRCS= ${G_LIBGDB_OBS:.o=.c}
GCPPFLAGS= ${G_INTERNAL_CFLAGS}
CPPFLAGS= -I${.CURDIR} \
- -I${.CURDIR}/../arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../arch/${GDB_MACHINE_ARCH} \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
-I${DIST}/include/opcode \
-I${DIST} \
- -I${.CURDIR}/../bfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../bfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
${GCPPFLAGS:M-D*}
@@ -32,7 +32,7 @@ CPPFLAGS.inf-ptrace.c= -Wno-error
.include <bsd.lib.mk>
.PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
- ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${MACHINE_ARCH}
+ ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}
#
COPTS+= -Wno-stack-protector
Index: src/gnu/usr.bin/gdb6/libiberty/Makefile
diff -u src/gnu/usr.bin/gdb6/libiberty/Makefile:1.5 src/gnu/usr.bin/gdb6/libiberty/Makefile:1.5.12.1
--- src/gnu/usr.bin/gdb6/libiberty/Makefile:1.5 Sat May 3 14:48:31 2008
+++ src/gnu/usr.bin/gdb6/libiberty/Makefile Wed Dec 18 18:43:30 2013
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.5.12.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
+.include "../Makefile.inc"
+
LIBISPRIVATE= yes
LIB= iberty
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gdb6
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/include
COPTS.argv.c = -Wno-stack-protector
Index: src/gnu/usr.bin/gdb6/opcodes/Makefile
diff -u src/gnu/usr.bin/gdb6/opcodes/Makefile:1.3 src/gnu/usr.bin/gdb6/opcodes/Makefile:1.3.12.1
--- src/gnu/usr.bin/gdb6/opcodes/Makefile:1.3 Sat May 3 14:48:31 2008
+++ src/gnu/usr.bin/gdb6/opcodes/Makefile Wed Dec 18 18:43:30 2013
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.3.12.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
+.include "../Makefile.inc"
+
LIBISPRIVATE= yes
LIB= opcodes
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gdb6
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../bfd/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
+ -I${.CURDIR}/../bfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} \
${GCPPFLAGS:M-I*:N-I.*}
Index: src/gnu/usr.bin/gdb6/readline/Makefile
diff -u src/gnu/usr.bin/gdb6/readline/Makefile:1.3 src/gnu/usr.bin/gdb6/readline/Makefile:1.3.12.1
--- src/gnu/usr.bin/gdb6/readline/Makefile:1.3 Sat May 3 14:48:31 2008
+++ src/gnu/usr.bin/gdb6/readline/Makefile Wed Dec 18 18:43:30 2013
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.3.12.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
+.include "../Makefile.inc"
+
LIBISPRIVATE= yes
LIB= readline
NOGCCERROR= yes
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gdb6
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/ \
${G_CCFLAGS:M-DRL_*} \
Index: src/gnu/usr.bin/gdb6/sim/Makefile
diff -u src/gnu/usr.bin/gdb6/sim/Makefile:1.3 src/gnu/usr.bin/gdb6/sim/Makefile:1.3.30.1
--- src/gnu/usr.bin/gdb6/sim/Makefile:1.3 Sat Nov 18 20:19:24 2006
+++ src/gnu/usr.bin/gdb6/sim/Makefile Wed Dec 18 18:43:30 2013
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2006/11/18 20:19:24 he Exp $
+# $NetBSD: Makefile,v 1.3.30.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
+.include "../Makefile.inc"
+
# PSIM support for PowerPC.
-.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == powerpcle || \
- ${MACHINE_ARCH} == powerpc64
+.if ${GDB_MACHINE_ARCH} == powerpc || ${GDB_MACHINE_ARCH} == powerpcle || \
+ ${GDB_MACHINE_ARCH} == powerpc64
SUBDIR+= ppc .WAIT psim
.endif
Index: src/gnu/usr.sbin/dbsym/Makefile
diff -u src/gnu/usr.sbin/dbsym/Makefile:1.13 src/gnu/usr.sbin/dbsym/Makefile:1.13.44.1
--- src/gnu/usr.sbin/dbsym/Makefile:1.13 Sat Jan 3 14:04:27 2004
+++ src/gnu/usr.sbin/dbsym/Makefile Wed Dec 18 18:43:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 14:04:27 lukem Exp $
+# $NetBSD: Makefile,v 1.13.44.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
@@ -25,12 +25,13 @@ DPADD+= ${IBERTYDIR}/libiberty.a
LDADD+= -L${IBERTYDIR} -liberty
.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
+BFD_MACHINE_ARCH=${MACHINE_ARCH:S/armv7/arm/}
+.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BFD_MACHINE_ARCH}/defs.mk"
BFDDIR!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
IBERTYDIR!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
+CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BFD_MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
Index: src/gnu/usr.sbin/mdsetimage/Makefile
diff -u src/gnu/usr.sbin/mdsetimage/Makefile:1.19 src/gnu/usr.sbin/mdsetimage/Makefile:1.19.16.1
--- src/gnu/usr.sbin/mdsetimage/Makefile:1.19 Sat Feb 9 02:37:21 2008
+++ src/gnu/usr.sbin/mdsetimage/Makefile Wed Dec 18 18:43:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/02/09 02:37:21 mrg Exp $
+# $NetBSD: Makefile,v 1.19.16.1 2013/12/18 18:43:30 matt Exp $
.include <bsd.own.mk>
@@ -25,12 +25,13 @@ DPADD+= ${IBERTYDIR}/libiberty.a
LDADD+= -L${IBERTYDIR} -liberty
.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
+BFD_MACHINE_ARCH=${MACHINE_ARCH:S/armv7/arm/}
+.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BFD_MACHINE_ARCH}/defs.mk"
BFDDIR!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
IBERTYDIR!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
+CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BFD_MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
