summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2022-12-24 20:17:46 +0000
committerchristos <christos@NetBSD.org>2022-12-24 20:17:46 +0000
commitf968fbe4ace5ce60b70e73aba578cb24f58c9350 (patch)
tree04ff8452cf60756ee11b1f4d36d34aafda053158 /tools
parente072ec67de202a82bd9f6314c76585f2772ab309 (diff)
Adjust for binutils-2.39
Diffstat (limited to 'tools')
-rw-r--r--tools/binutils/Makefile6
-rwxr-xr-xtools/binutils/mknative-binutils9
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/binutils/Makefile b/tools/binutils/Makefile
index 34f161294d8..1804f466c6d 100644
--- a/tools/binutils/Makefile
+++ b/tools/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/09/18 01:47:10 christos Exp $
+# $NetBSD: Makefile,v 1.34 2022/12/24 20:17:46 christos Exp $
.include <bsd.hostinit.mk>
@@ -16,10 +16,10 @@ CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
--disable-werror --enable-initfini-array=yes \
${BRANDING}
-build/gas/m68k-parse.c: ${GNUHOSTDIST}/gas/m68k-parse.c
+build/gas/m68k-parse.c: ${GNUHOSTDIST}/gas/config/m68k-parse.c
@mkdir build 2>/dev/null || true
@mkdir build/gas 2>/dev/null || true
- cat ${GNUHOSTDIST}/gas/m68k-parse.c > ${.TARGET}
+ cat ${GNUHOSTDIST}/gas/config/m68k-parse.c > ${.TARGET}
.configure_done: build/gas/m68k-parse.c
diff --git a/tools/binutils/mknative-binutils b/tools/binutils/mknative-binutils
index 8bfe00d3f30..803bf06b502 100755
--- a/tools/binutils/mknative-binutils
+++ b/tools/binutils/mknative-binutils
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-binutils,v 1.13 2020/04/04 01:34:53 christos Exp $
+# $NetBSD: mknative-binutils,v 1.14 2022/12/24 20:17:46 christos Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/external/gpl3/binutils
@@ -27,7 +27,6 @@ get_libbfd () {
write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
- write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfd_stdint.h <$_TMPDIR/bfd/bfd_stdint.h
{
cat $_TMPDIR/bfd/config.h
@@ -84,11 +83,11 @@ get_binutils () {
{
getvars binutils/Makefile \
VERSION DEFS INCLUDES PROGRAMS
- getvars binutils/doc/Makefile \
+ getvars binutils/Makefile \
man_MANS TEXINFOS
- getvars bfd/doc/Makefile \
+ getvars bfd/Makefile \
PKGVERSION | sed 's,\\\(.\),\1,'
- getvars bfd/doc/Makefile \
+ getvars bfd/Makefile \
REPORT_BUGS_TEXI
for f in `getvars binutils/Makefile PROGRAMS | sed 'y,-,_,;s,^[^=]*=,,'`; do