Thu Apr 25 14:53:36 2013 UTC ()
If libc isn't build with compat, ldexp/frexp will not be included.  Always
pick them up from libm instead.


(matt)
diff -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -r1.9 -r1.10 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs diff -r1.6 -r1.7 src/external/gpl3/binutils/usr.bin/common/Makefile.prog (expand / switch to unified diff)

--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog 2013/02/14 21:29:35 1.6
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog 2013/04/25 14:53:35 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.prog,v 1.6 2013/02/14 21:29:35 christos Exp $ 1# $NetBSD: Makefile.prog,v 1.7 2013/04/25 14:53:35 matt Exp $
2# 2#
3# Common Makefile fragment for a binutils program. 3# Common Makefile fragment for a binutils program.
4# 4#
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8TOP= ${NETBSDSRCDIR}/external/gpl3/binutils 8TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
9 9
10.include "${.CURDIR}/../common/Makefile.inc" 10.include "${.CURDIR}/../common/Makefile.inc"
11.include "${.CURDIR}/../common/arch/${MACHINE_ARCH}/defs.mk" 11.include "${.CURDIR}/../common/arch/${MACHINE_ARCH}/defs.mk"
12 12
13# Might end in "-new" in GNU makefile 13# Might end in "-new" in GNU makefile
14XPROG= ${PROG:c++filt=cxxfilt} 14XPROG= ${PROG:c++filt=cxxfilt}
@@ -26,18 +26,18 @@ PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR} @@ -26,18 +26,18 @@ PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR}
26 26
27.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*) 27.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
28PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd 28PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
29.endif 29.endif
30 30
31.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*) 31.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
32PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty 32PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
33.endif 33.endif
34 34
35.PATH: ${DIST}/binutils ${DIST}/binutils/doc 35.PATH: ${DIST}/binutils ${DIST}/binutils/doc
36 36
37.include <bsd.prog.mk> 37.include <bsd.prog.mk>
38 38
39LDADD+= -lintl -lz 39LDADD+= -lintl -lz -lm
40DPADD+= ${LIBINTL} ${LIBZ} 40DPADD+= ${LIBINTL} ${LIBZ} ${LIBM}
41 41
42# Override the .y.c and .y.l rules *after* <bsd.prog.mk> 42# Override the .y.c and .y.l rules *after* <bsd.prog.mk>
43.y.c .l.c: 43.y.c .l.c:
cvs diff -r1.9 -r1.10 src/external/gpl3/binutils/usr.bin/gas/Makefile (expand / switch to unified diff)

--- src/external/gpl3/binutils/usr.bin/gas/Makefile 2013/02/14 21:29:35 1.9
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile 2013/04/25 14:53:36 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2013/02/14 21:29:35 christos Exp $ 1# $NetBSD: Makefile,v 1.10 2013/04/25 14:53:36 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TOP= ${NETBSDSRCDIR}/external/gpl3/binutils 5TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
6 6
7.include "${.CURDIR}/../common/Makefile.inc" 7.include "${.CURDIR}/../common/Makefile.inc"
8.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk" 8.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
9 9
10PROG= as 10PROG= as
11SRCS= ${G_OBJS:Nitbl-[pl]*:Nm68k-parse.o:.o=.c} \ 11SRCS= ${G_OBJS:Nitbl-[pl]*:Nm68k-parse.o:.o=.c} \
12 ${G_OBJS:Mitbl-parse.o:.o=.y} \ 12 ${G_OBJS:Mitbl-parse.o:.o=.y} \
13 ${G_OBJS:Mitbl-lex.o:.o=.l} \ 13 ${G_OBJS:Mitbl-lex.o:.o=.l} \
14 ${G_OBJS:Mm68k-parse.o:.o=.y} 14 ${G_OBJS:Mm68k-parse.o:.o=.y}
@@ -29,15 +29,15 @@ PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/lib @@ -29,15 +29,15 @@ PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/lib
29PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty 29PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
30 30
31TEXINFO= as.texinfo 31TEXINFO= as.texinfo
32COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR} 32COMMONOBJDIR!= cd ${TOP}/usr.bin/common && ${PRINTOBJDIR}
33INFOFLAGS= -I${DIST}/gas/doc -I${COMMONOBJDIR} -I${DIST}/libiberty 33INFOFLAGS= -I${DIST}/gas/doc -I${COMMONOBJDIR} -I${DIST}/libiberty
34 34
35as.info: bfdver.texi 35as.info: bfdver.texi
36 36
37.PATH: ${COMMONOBJDIR} ${DIST}/gas ${DIST}/gas/config ${DIST}/gas/doc 37.PATH: ${COMMONOBJDIR} ${DIST}/gas ${DIST}/gas/config ${DIST}/gas/doc
38 38
39.include <bsd.prog.mk> 39.include <bsd.prog.mk>
40.include <bsd.info.mk> 40.include <bsd.info.mk>
41 41
42LDADD+= -lintl -lz 42LDADD+= -lintl -lz -lm
43DPADD+= ${LIBINTL} ${LIBZ} 43DPADD+= ${LIBINTL} ${LIBZ} ${LIBM}