Module Name: src
Committed By: christos
Date: Mon Jul 31 17:09:59 UTC 2023
Modified Files:
src/tools/gdb: Makefile mknative-gdb
Log Message:
mknative support for gdb-13.2
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/tools/gdb/Makefile
cvs rdiff -u -r1.15 -r1.16 src/tools/gdb/mknative-gdb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.41 src/tools/gdb/Makefile:1.42
--- src/tools/gdb/Makefile:1.41 Mon May 8 05:47:20 2023
+++ src/tools/gdb/Makefile Mon Jul 31 13:09:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/05/08 09:47:20 skrll Exp $
+# $NetBSD: Makefile,v 1.42 2023/07/31 17:09:59 christos Exp $
.include <bsd.hostinit.mk>
@@ -10,7 +10,7 @@ FIND_ARGS= \! \( -type d -name sim -prun
CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
- --without-mpfr
+ --without-mpfr --with-libgmp-prefix=${TOOLDIR}
MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
@@ -107,6 +107,7 @@ native-gdb: .native/.configure_done
${MKNATIVE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure \
--prefix=/usr \
--with-separate-debug-dir=/usr/libdata/debug \
+ --with-libgmp-prefix=${TOOLDIR} \
${CONFIGURE_ARGS_SIM} \
${CONFIGURE_ARGS_GDBSERVER} \
--build=`${GNUHOSTDIST}/config.guess` \
@@ -118,7 +119,9 @@ native-gdb: .native/.configure_done
(cd ${.OBJDIR}/.native/bfd && \
${MKENV_BUILD_MAKE} bfd.h bfdver.h) && \
(cd ${.OBJDIR}/.native/gdb && \
- ${MKENV_BUILD_MAKE} init.c version.c) && \
+ ${MKENV_BUILD_MAKE} xml-builtin.c init.c version.c) && \
+ (cd ${.OBJDIR}/.native/libbacktrace && \
+ ${MKENV_BUILD_MAKE} backtrace-supported.h) && \
(if [ -d ${.OBJDIR}/.native/gdbserver ]; then \
cd ${.OBJDIR}/.native/gdbserver && \
${MKENV_BUILD_MAKE} version-generated.cc; fi)
Index: src/tools/gdb/mknative-gdb
diff -u src/tools/gdb/mknative-gdb:1.15 src/tools/gdb/mknative-gdb:1.16
--- src/tools/gdb/mknative-gdb:1.15 Sat Dec 5 16:27:31 2020
+++ src/tools/gdb/mknative-gdb Mon Jul 31 13:09:59 2023
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gdb,v 1.15 2020/12/05 21:27:31 christos Exp $
+# $NetBSD: mknative-gdb,v 1.16 2023/07/31 17:09:59 christos Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/external/gpl3/gdb
@@ -28,7 +28,7 @@ get_gdb_libbfd () {
INCLUDES TDEFAULTS
} | write_mk $_BFD/arch/$_MACHINE_SUBDIR/defs.mk
- for i in bfd-in3.h bfd_stdint.h config.h bfd.h bfdver.h targmatch.h
+ for i in bfd-in3.h config.h bfd.h bfdver.h targmatch.h
do
write_c $_BFD/arch/$_MACHINE_SUBDIR/$i <$_TMPDIR/bfd/$i
done
@@ -86,7 +86,7 @@ get_gdb_libdecnumber () {
mkdir -p $_TOP/$_DECNUMBER/arch/$_MACHINE_SUBDIR
getvars libdecnumber/Makefile libdecnumber_a_OBJS |
- sed -e s/libdecnumber_a_// |
+ sed -e s/libdecnumber_a_//g |
write_mk $_DECNUMBER/arch/$_MACHINE_SUBDIR/defs.mk
write_c $_DECNUMBER/arch/$_MACHINE_SUBDIR/config.h \
@@ -103,43 +103,75 @@ get_gdb_libgdbsupport () {
mkdir -p $_TOP/$_GDBSUPPORT/arch/$_MACHINE_SUBDIR/gdbsupport
getvars gdbsupport/Makefile libgdbsupport_a_OBJECTS |
- sed -e s/libgdbsupport_a_// |
+ sed -e s/libgdbsupport_a_//g |
write_mk $_GDBSUPPORT/arch/$_MACHINE_SUBDIR/defs.mk
write_c $_GDBSUPPORT/arch/$_MACHINE_SUBDIR/gdbsupport/config.h \
<$_TMPDIR/gdbsupport/config.h
}
+##### gdb/lib/libctf #####
+
get_gdb_libctf () {
local _CTF=$_GDB/lib/libctf
mkdir -p $_TOP/$_CTF/arch/$_MACHINE_SUBDIR
getvars libctf/Makefile libctf_la_OBJECTS |
- sed -e s/libctf_la_// -e 's/\.lo/.o/g' -e s/libctf_la-//g |
+ sed -e s/libctf_la_//g -e 's/\.lo/.o/g' -e s/libctf_la-//g |
write_mk $_CTF/arch/$_MACHINE_SUBDIR/defs.mk
write_c $_CTF/arch/$_MACHINE_SUBDIR/config.h \
<$_TMPDIR/libctf/config.h
}
+##### gdb/lib/libbacktrace #####
+
+get_gdb_libbacktrace () {
+ local _BACKTRACE=$_GDB/lib/libbacktrace
+ mkdir -p $_TOP/$_BACKTRACE/arch/$_MACHINE_SUBDIR
+
+ getvars libbacktrace/Makefile libbacktrace_la_OBJECTS \
+ libbacktrace_la_LIBADD |
+ sed -e s/libbacktrace_la_//g -e 's/\.lo/.o/g' -e s/libbacktrace_la-//g |
+ write_mk $_BACKTRACE/arch/$_MACHINE_SUBDIR/defs.mk
+
+ write_c $_BACKTRACE/arch/$_MACHINE_SUBDIR/config.h \
+ <$_TMPDIR/libbacktrace/config.h
+ write_c $_BACKTRACE/arch/$_MACHINE_SUBDIR/backtrace-supported.h \
+ <$_TMPDIR/libbacktrace/backtrace-supported.h
+}
+
+##### gdb/lib/libsframe #####
+
+get_gdb_libsframe () {
+ local _SFRAME=$_GDB/lib/libsframe
+ mkdir -p $_TOP/$_SFRAME/arch/$_MACHINE_SUBDIR
+
+ getvars libsframe/Makefile libsframe_la_OBJECTS |
+ sed -e s/libsframe_la_//g -e 's/\.lo/.o/g' -e s/libsframe_la-//g |
+ write_mk $_SFRAME/arch/$_MACHINE_SUBDIR/defs.mk
+}
+
##### gdb/lib/libgnulib #####
get_gdb_libgnulib () {
local _GNULIB=$_GDB/lib/libgnulib
- mkdir -p $_TOP/$_GNULIB/arch/$_MACHINE_SUBDIR/gnulib/import
+ mkdir -p $_TOP/$_GNULIB/arch/$_MACHINE_SUBDIR/gnulib/import/malloc
(getvars gnulib/Makefile gl_LIBOBJS |
- sed -e s/gl_LIB// &&
+ sed -e s/gl_LIB//g &&
getvars gnulib/import/Makefile libgnu_a_OBJECTS |
- sed -e s/libgnu_a_// -e s@glthread/@@g -e s@malloc/@@g) |
+ sed -e s/libgnu_a-//g -e s@glthread/@@g -e s@malloc/@@g) |
write_mk $_GNULIB/arch/$_MACHINE_SUBDIR/defs.mk
for i in config.h \
import/alloca.h import/ctype.h \
import/dirent.h import/fcntl.h \
import/fnmatch.h import/glob.h \
+ import/glob-libc.gl.h \
import/inttypes.h import/limits.h \
import/locale.h import/math.h \
+ import/malloc/scratch_buffer.gl.h \
import/signal.h import/stdint.h \
import/stdio.h import/stdlib.h \
import/string.h import/time.h \
@@ -237,6 +269,8 @@ all|gdb) # everything (uses "canadian cr
get_gdb_libgdb
get_gdb_libgdbsupport
get_gdb_libctf
+ get_gdb_libbacktrace
+ get_gdb_libsframe
get_gdb_libgnulib
get_gdb_libbfd
get_gdb_libopcodes
