Module Name: src
Committed By: christos
Date: Thu Jul 4 02:20:03 UTC 2024
Modified Files:
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: Makefile
Added Files:
src/external/gpl3/binutils/usr.sbin: bfd.mk
Log Message:
Adjust for new binutils
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/binutils/usr.sbin/bfd.mk
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/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/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.13 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.14
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.13 Sun Jun 30 12:10:22 2024
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Wed Jul 3 22:20:03 2024
@@ -1,41 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2024/06/30 16:10:22 christos Exp $
+# $NetBSD: Makefile,v 1.14 2024/07/04 02:20:03 christos Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
-BFDSUBDIR= lib
PROG= dbsym
MAN= dbsym.8
-CPPFLAGS+= -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
-
-.if !defined(HOSTPROG)
-PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+= sframe ${TOP}/${BFDSUBDIR}/libsframe
-PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
-.else
-CPPFLAGS+= -I${BFDDIR}
-DPADD+= ${BFDDIR}/libbfd.a
-LDADD+= -L${BFDDIR} -lbfd
-DPADD+= ${SFRAMEDIR}/libsframe.a
-LDADD+= -L${SFRAMEDIR} -lsframe
-DPADD+= ${IBERTYDIR}/libiberty.a
-LDADD+= -L${IBERTYDIR} -liberty
-.endif
-
-.include <bsd.prog.mk>
-
-.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} ${G_INCLUDES}
-LDADD+= -lintl
-DPADD+= ${LIBINTL}
-.endif # HOSTPROG
-
-LDADD+= -lz
-# No DPADD because we don't know the format and we didn't build it.
+.include "${.PARSEDIR}/../bfd.mk"
.endif # MKBINUTILS != no
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.15 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.16
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.15 Sun Jun 30 13:46:39 2024
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Wed Jul 3 22:20:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/06/30 17:46:39 christos Exp $
+# $NetBSD: Makefile,v 1.16 2024/07/04 02:20:03 christos Exp $
.include <bsd.init.mk>
@@ -8,40 +8,13 @@ MDSETIMAGE=${NETBSDSRCDIR}/usr.sbin/mdse
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
-BFDSUBDIR= lib
PROG= mdsetimage
SRCS= mdsetimage.c bin_bfd.c
MAN= mdsetimage.8
-CPPFLAGS+= -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include -I${MDSETIMAGE}
+CPPFLAGS+= -I${MDSETIMAGE}
-.if !defined(HOSTPROG)
-PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
-PROGDPLIBS+= sframe ${TOP}/${BFDSUBDIR}/libsframe
-PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
-.else
-DPADD+= ${BFDDIR}/libbfd.a
-LDADD+= -L${BFDDIR} -lbfd
-DPADD+= ${SFRAMEDIR}/libsframe.a
-LDADD+= -L${SFRAMEDIR} -lsframe
-DPADD+= ${IBERTYDIR}/libiberty.a
-LDADD+= -L${IBERTYDIR} -liberty
-CPPFLAGS+= -I${BFDDIR}
-.endif
-
-.include <bsd.prog.mk>
-
-.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
-
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} ${G_INCLUDES}
-LDADD+= -lintl
-DPADD+= ${LIBINTL}
-DPADD+= ${LIBZ}
-.endif # HOSTPROG
-
-LDADD+= -lz
-# No DPADD because we don't know the format and we didn't build it.
+.include "${.PARSEDIR}/../bfd.mk"
.endif # MKBINUTILS != no
Added files:
Index: src/external/gpl3/binutils/usr.sbin/bfd.mk
diff -u /dev/null src/external/gpl3/binutils/usr.sbin/bfd.mk:1.1
--- /dev/null Wed Jul 3 22:20:03 2024
+++ src/external/gpl3/binutils/usr.sbin/bfd.mk Wed Jul 3 22:20:03 2024
@@ -0,0 +1,31 @@
+# $NetBSD: bfd.mk,v 1.1 2024/07/04 02:20:03 christos Exp $
+
+BFDSUBDIR= lib
+
+CPPFLAGS+= -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
+
+.if !defined(HOSTPROG)
+PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
+PROGDPLIBS+= sframe ${TOP}/${BFDSUBDIR}/libsframe
+PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
+.else
+CPPFLAGS+= -I${BFDDIR}
+DPADD+= ${BFDDIR}/.libs/libbfd.a
+LDADD+= -L${BFDDIR}/.libs -lbfd
+DPADD+= ${SFRAMEDIR}/.libs/libsframe.a
+LDADD+= -L${SFRAMEDIR}/.libs -lsframe
+DPADD+= ${IBERTYDIR}/libiberty.a
+LDADD+= -L${IBERTYDIR} -liberty
+.endif
+
+.include <bsd.prog.mk>
+
+.ifndef HOSTPROG
+.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
+CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} ${G_INCLUDES}
+LDADD+= -lintl
+DPADD+= ${LIBINTL}
+.endif # HOSTPROG
+
+LDADD+= -lz
+# No DPADD because we don't know the format and we didn't build it.
