Module Name:    src
Committed By:   christos
Date:           Sat Dec 24 20:17:46 UTC 2022

Modified Files:
        src/tools/binutils: Makefile mknative-binutils

Log Message:
Adjust for binutils-2.39


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tools/binutils/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tools/binutils/mknative-binutils

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.33 src/tools/binutils/Makefile:1.34
--- src/tools/binutils/Makefile:1.33	Fri Sep 17 21:47:10 2021
+++ src/tools/binutils/Makefile	Sat Dec 24 15:17:46 2022
@@ -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_P
 		--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
 

Index: src/tools/binutils/mknative-binutils
diff -u src/tools/binutils/mknative-binutils:1.13 src/tools/binutils/mknative-binutils:1.14
--- src/tools/binutils/mknative-binutils:1.13	Fri Apr  3 21:34:53 2020
+++ src/tools/binutils/mknative-binutils	Sat Dec 24 15:17:46 2022
@@ -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

Reply via email to