Module Name:    src
Committed By:   mrg
Date:           Sun Oct 16 04:36:52 UTC 2016

Modified Files:
        src/external/gpl3/gdb: Makefile.inc
        src/external/gpl3/gdb.old: Makefile.inc
Added Files:
        src/external/gpl3/gdb: Makefile.gdb_arch
        src/external/gpl3/gdb.old: Makefile.gdb_arch

Log Message:
move the GDB_MACHINE_ARCH setting into a separate file so tools can
access it.  modify it such that it's "arm" or "armeb" for all arm,
but only in new gdb, not gdb.old (avoid changing gdb.old as much
as possible now.)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/Makefile.gdb_arch
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb.old/Makefile.gdb_arch
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb.old/Makefile.inc

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.10 src/external/gpl3/gdb/Makefile.inc:1.11
--- src/external/gpl3/gdb/Makefile.inc:1.10	Sat Jan 23 23:02:31 2016
+++ src/external/gpl3/gdb/Makefile.inc	Sun Oct 16 04:36:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2016/01/23 23:02:31 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2016/10/16 04:36:52 mrg Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
@@ -6,7 +6,7 @@ BINDIR=/usr/bin
 WARNS?=		0
 CPPFLAGS+=	-D_KERNTYPES
 
-GDB_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}
+.include "Makefile.gdb_arch"
 
 CWARNFLAGS.clang+=	-Wno-unused-value -Wno-conversion \
 			-Wno-switch-enum -Wno-parentheses -Wno-comment \

Index: src/external/gpl3/gdb.old/Makefile.inc
diff -u src/external/gpl3/gdb.old/Makefile.inc:1.7 src/external/gpl3/gdb.old/Makefile.inc:1.8
--- src/external/gpl3/gdb.old/Makefile.inc:1.7	Wed Oct 12 15:36:05 2016
+++ src/external/gpl3/gdb.old/Makefile.inc	Sun Oct 16 04:36:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2016/10/12 15:36:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2016/10/16 04:36:51 mrg Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
@@ -6,7 +6,7 @@ BINDIR=/usr/bin
 WARNS?=		0
 CPPFLAGS+=	-D_KERNTYPES
 
-GDB_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}
+.include "Makefile.gdb_arch"
 
 CWARNFLAGS.clang+=	-Wno-unused-value -Wno-conversion \
 			-Wno-switch-enum -Wno-parentheses -Wno-comment \

Added files:

Index: src/external/gpl3/gdb/Makefile.gdb_arch
diff -u /dev/null src/external/gpl3/gdb/Makefile.gdb_arch:1.1
--- /dev/null	Sun Oct 16 04:36:52 2016
+++ src/external/gpl3/gdb/Makefile.gdb_arch	Sun Oct 16 04:36:51 2016
@@ -0,0 +1,3 @@
+#	$NetBSD#
+
+GDB_MACHINE_ARCH=	${MACHINE_ARCH:C/^e//:C/e?armv[4-7]h?f?/arm/}

Index: src/external/gpl3/gdb.old/Makefile.gdb_arch
diff -u /dev/null src/external/gpl3/gdb.old/Makefile.gdb_arch:1.1
--- /dev/null	Sun Oct 16 04:36:52 2016
+++ src/external/gpl3/gdb.old/Makefile.gdb_arch	Sun Oct 16 04:36:51 2016
@@ -0,0 +1,3 @@
+#	$NetBSD#
+
+GDB_MACHINE_ARCH=	${MACHINE_ARCH:C/armv[4-7]/arm/}

Reply via email to