Module Name: src
Committed By: matt
Date: Sun Aug 4 23:41:43 UTC 2013
Modified Files:
src/external/gpl3/gdb: Makefile.inc
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/bin/gdbtui: Makefile
src/external/gpl3/gdb/lib/libbfd: Makefile
src/external/gpl3/gdb/lib/libdecnumber: Makefile
src/external/gpl3/gdb/lib/libgdb: Makefile
src/external/gpl3/gdb/lib/libiberty: Makefile
src/external/gpl3/gdb/lib/libopcodes: Makefile
src/external/gpl3/gdb/lib/libreadline: Makefile
src/external/gpl3/gdb/lib/libsim: Makefile
Log Message:
Use GDB_MACHINE_ARCH instead of MACHINE_ARCH.
GDB_MACHINE_ARCH is MACHINE_ARCH, except armv[467] is replaced with arm instead.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/bin/gdbtui/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/lib/libbfd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libdecnumber/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libiberty/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libopcodes/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/lib/libreadline/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libsim/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.6 src/external/gpl3/gdb/Makefile.inc:1.7
--- src/external/gpl3/gdb/Makefile.inc:1.6 Fri Jun 22 20:32:35 2012
+++ src/external/gpl3/gdb/Makefile.inc Sun Aug 4 23:41:43 2013
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.6 2012/06/22 20:32:35 abs Exp $
+# $NetBSD: Makefile.inc,v 1.7 2013/08/04 23:41:43 matt Exp $
USE_LIBEDIT=no
USE_TUI=yes
BINDIR=/usr/bin
WARNS?= 0
+GDB_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[457]/arm/}
+
CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \
-Wno-switch-enum -Wno-parentheses -Wno-comment \
-Wno-format-security \
Index: src/external/gpl3/gdb/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.5 src/external/gpl3/gdb/bin/gdb/Makefile:1.6
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.5 Fri Nov 4 17:52:19 2011
+++ src/external/gpl3/gdb/bin/gdb/Makefile Sun Aug 4 23:41:43 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2011/11/04 17:52:19 christos Exp $
+# $NetBSD: Makefile,v 1.6 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
-GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${MACHINE_ARCH}
+GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${GDB_MACHINE_ARCH}
.include "${GDBARCHDIR}/defs.mk"
PROG= gdb
@@ -15,7 +15,7 @@ CPPFLAGS+= -I${.CURDIR} \
-I${DIST}/gdb/config \
-I${DIST}/include/opcode \
-I${DIST} \
- -I${.CURDIR}/../../lib/libbfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../../lib/libbfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
${GCPPFLAGS:M-D*}
@@ -55,8 +55,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}/../../lib/libsim && ${PRINTOBJDIR}
LDADD+= -L${SIMOBJ} -lsim
DPADD+= ${SIMOBJ}/libsim.a
@@ -88,4 +88,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/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.3 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.4
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.3 Wed Oct 12 03:57:45 2011
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile Sun Aug 4 23:41:43 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/10/12 03:57:45 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/04 23:41:43 matt Exp $
.include "../Makefile.inc"
-GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${MACHINE_ARCH}
+GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${GDB_MACHINE_ARCH}
.include "${GDBARCHDIR}/defs.mk"
PROG= gdbtui
@@ -14,7 +14,7 @@ CPPFLAGS+= -I${.CURDIR} \
-I${DIST}/gdb/config \
-I${DIST}/include/opcode \
-I${DIST} \
- -I${.CURDIR}/../../lib/libbfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../../lib/libbfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
${GCPPFLAGS:M-D*}
@@ -42,8 +42,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}/../../lib/libsim && ${PRINTOBJDIR}
LDADD+= -L${SIMOBJ} -lsim
DPADD+= ${SIMOBJ}/libsim.a
@@ -72,4 +72,4 @@ DPADD+= ${LIBZ} ${LIBCURSES} ${LIBINTL}
LDADD+= -lpthread_dbg
.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/external/gpl3/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.2 src/external/gpl3/gdb/lib/libbfd/Makefile:1.3
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.2 Sun Oct 2 18:16:06 2011
+++ src/external/gpl3/gdb/lib/libbfd/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/02 18:16:06 christos Exp $
+# $NetBSD: Makefile,v 1.3 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -7,10 +7,10 @@ LIBISPRIVATE= yes
LIB= bfd
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
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.*} \
-DDEBUGDIR=\"${DESTDIR}/usr/libdata/debug\"
Index: src/external/gpl3/gdb/lib/libdecnumber/Makefile
diff -u src/external/gpl3/gdb/lib/libdecnumber/Makefile:1.1 src/external/gpl3/gdb/lib/libdecnumber/Makefile:1.2
--- src/external/gpl3/gdb/lib/libdecnumber/Makefile:1.1 Mon Sep 26 03:02:45 2011
+++ src/external/gpl3/gdb/lib/libdecnumber/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/09/26 03:02:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -7,11 +7,11 @@ LIBISPRIVATE= yes
LIB= decnumber
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../libbfd/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
+ -I${.CURDIR}/../libbfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/include -I. \
-I${DIST}/libdecnumber ${GCPPFLAGS:M-D*} \
${GCPPFLAGS:M-I*:N-I.*}
Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.3 src/external/gpl3/gdb/lib/libgdb/Makefile:1.4
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.3 Tue Feb 28 22:07:54 2012
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/02/28 22:07:54 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
LIBISPRIVATE= yes
LIB= gdb
-GDBARCHDIR= ${.CURDIR}/arch/${MACHINE_ARCH}
+GDBARCHDIR= ${.CURDIR}/arch/${GDB_MACHINE_ARCH}
.include "${GDBARCHDIR}/defs.mk"
@@ -22,8 +22,8 @@ CPPFLAGS+= -I${.CURDIR} \
-I${DIST}/include/opcode \
-I${DIST}/libdecnumber \
-I${DIST} \
- -I${.CURDIR}/../libbfd/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../libdecnumber/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../libbfd/arch/${GDB_MACHINE_ARCH} \
+ -I${.CURDIR}/../libdecnumber/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/include \
-DTARGET_SYSTEM_ROOT=\"\" \
Index: src/external/gpl3/gdb/lib/libiberty/Makefile
diff -u src/external/gpl3/gdb/lib/libiberty/Makefile:1.1 src/external/gpl3/gdb/lib/libiberty/Makefile:1.2
--- src/external/gpl3/gdb/lib/libiberty/Makefile:1.1 Mon Sep 26 03:02:45 2011
+++ src/external/gpl3/gdb/lib/libiberty/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/09/26 03:02:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -7,12 +7,12 @@ LIBISPRIVATE= yes
LIB= iberty
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
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/external/gpl3/gdb/lib/libopcodes/Makefile
diff -u src/external/gpl3/gdb/lib/libopcodes/Makefile:1.1 src/external/gpl3/gdb/lib/libopcodes/Makefile:1.2
--- src/external/gpl3/gdb/lib/libopcodes/Makefile:1.1 Mon Sep 26 03:02:45 2011
+++ src/external/gpl3/gdb/lib/libopcodes/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/09/26 03:02:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -7,11 +7,11 @@ LIBISPRIVATE= yes
LIB= opcodes
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../libbfd/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
+ -I${.CURDIR}/../libbfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} \
${GCPPFLAGS:M-I*:N-I.*}
Index: src/external/gpl3/gdb/lib/libreadline/Makefile
diff -u src/external/gpl3/gdb/lib/libreadline/Makefile:1.2 src/external/gpl3/gdb/lib/libreadline/Makefile:1.3
--- src/external/gpl3/gdb/lib/libreadline/Makefile:1.2 Sun Oct 16 19:41:07 2011
+++ src/external/gpl3/gdb/lib/libreadline/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/16 19:41:07 christos Exp $
+# $NetBSD: Makefile,v 1.3 2013/08/04 23:41:43 matt Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -9,9 +9,9 @@ LIB= readline
NOGCCERROR= yes
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${GDB_MACHINE_ARCH}/defs.mk"
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/ \
-DHAVE_SYS_IOCTL_H \
${G_CCFLAGS:M-DRL_*} \
Index: src/external/gpl3/gdb/lib/libsim/Makefile
diff -u src/external/gpl3/gdb/lib/libsim/Makefile:1.1 src/external/gpl3/gdb/lib/libsim/Makefile:1.2
--- src/external/gpl3/gdb/lib/libsim/Makefile:1.1 Sun Oct 9 02:03:21 2011
+++ src/external/gpl3/gdb/lib/libsim/Makefile Sun Aug 4 23:41:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/10/09 02:03:21 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/08/04 23:41:43 matt Exp $
LIBISPRIVATE= yes
NOGCCERROR=
@@ -20,13 +20,13 @@ MIC= ${HOST_SH} ${DIST}/move-if-change
HOST_CPPFLAGS+= -I. \
-I${DIST}/sim/ppc -I${DIST}/include \
- -I${.CURDIR}/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../libbfd/arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} \
+ -I${.CURDIR}/../libbfd/arch/${GDB_MACHINE_ARCH} \
-I${DIST}/bfd \
-I${DIST}/gdb \
-I${DIST}/gdb/config \
-DHAVE_COMMON_FPU \
- -I${.CURDIR}/../arch/${MACHINE_ARCH} \
+ -I${.CURDIR}/../arch/${GDB_MACHINE_ARCH} \
-I${DIST}/sim/common
PSIM_DEFINES= -DHAVE_CONFIG_H \
-DDEFAULT_INLINE=PSIM_INLINE_LOCALS \
@@ -195,7 +195,7 @@ ${DEFINES_H}: run-defines
run-defines:
${TOOL_SED} -n -e '/^#define HAVE_/s/ 1$$/",/' \
-e '/^#define HAVE_/s//"HAVE_/p' \
- < ${.CURDIR}/arch/${MACHINE_ARCH}/config.h > tmp-defines.h
+ < ${.CURDIR}/arch/${GDB_MACHINE_ARCH}/config.h > tmp-defines.h
${MIC} tmp-defines.h defines.h
touch run-defines
DPSRCS+= ${DEFINES_H}
