Sync with binutils.

This commit is contained in:
christos 2016-01-26 19:38:09 +00:00
parent 62d79eec21
commit eaa6761b21
29 changed files with 62 additions and 115 deletions

View File

@ -0,0 +1,4 @@
# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:38:09 christos Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}
DIST= ${TOP}/dist

View File

@ -0,0 +1,2 @@
# $NetBSD: Makefile.inc,v 1.1 2016/01/26 19:38:09 christos Exp $
.include "${.PARSEDIR}/../Makefile.inc"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:26:57 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:09 christos Exp $
NOLINKLIB= # defined
NOLINT= # defined
@ -6,7 +6,7 @@ NOMAN= # defined
NOPROFILE= # defined
NOCLANGERROR= # defined
.include <bsd.own.mk>
.include <bsd.init.mk>
# If the platform does not support shared libraries, we need to supply
# *something* for BFD-using programs to link against. Also provide an
@ -25,8 +25,6 @@ DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
.if exists(${DEFS_MK})
.include "${DEFS_MK}"
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
SHLIB_MAJOR= 13
SHLIB_MINOR= 0

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
NOLINT= # defined
NOPROFILE= # defined
@ -6,7 +6,7 @@ NOPIC= # defined
NOLINKLIB= # defined
NOCLANGERROR= # defined
.include <bsd.own.mk>
.include <bsd.init.mk>
LIB= iberty
@ -19,8 +19,6 @@ COPTS.cp-demangle.c = -Wno-stack-protector
COPTS.make-relative-prefix.c = -Wno-stack-protector
COPTS.regex.c = -Wno-stack-protector
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
NOLINKLIB= # defined
NOLINT= # defined
@ -6,7 +6,7 @@ NOMAN= # defined
NOPROFILE= # defined
NOCLANGERROR= # defined
.include <bsd.own.mk>
.include <bsd.init.mk>
LIB= opcodes
@ -15,8 +15,6 @@ BFD_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv[4-7]/arm/}
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
SHLIB_MAJOR= 6
SHLIB_MINOR= 0

View File

@ -1,20 +1,5 @@
# $NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:10 christos Exp $
BINDIR?= /usr/bin
.if !defined(__MAKEFILE_INC_INCLUDED__)
__MAKEFILE_INC_INCLUDED__=1
.include <bsd.own.mk>
BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[4-7]/arm/}
GNUHOSTDIST= ${DIST}
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
-I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
-DLOCALEDIR=\"${LOCALEDIR}\"
NOGCCERROR= # defined
.endif # __MAKEFILE_INC_INCLUDED__
.include "${.PARSEDIR}/../Makefile.inc"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
PROG= addr2line
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,10 +1,8 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
PROG= ar
COPTS.arparse.c = -Wno-stack-protector
CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,11 +1,9 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
PROG= c++filt
CPPFLAGS+= -DMAIN
CLEANFILES+= c++filt.1
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"
.PATH: ${DIST}/libiberty

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
PROG= coffdump
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,8 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"

View File

@ -1,10 +1,19 @@
# $NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:10 christos Exp $
.if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
__COMMON_MAKEFILE_INC_INCLUDED__=1
.include <bsd.init.mk>
BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[4-7]/arm/}
GNUHOSTDIST= ${DIST}
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
-I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
-DLOCALEDIR=\"${LOCALEDIR}\"
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
BFDSUBDIR= lib
.endif

View File

@ -1,13 +1,12 @@
# $NetBSD: Makefile.prog,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile.prog,v 1.2 2016/01/26 19:38:10 christos Exp $
#
# Common Makefile fragment for a binutils program.
#
.include <bsd.own.mk>
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
CPPFLAGS+= -I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include <bsd.init.mk>
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@ -20,7 +19,6 @@ SRCS= ${G_${BUPROG}_OBJECTS:.o=.c} \
${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
MAN= ${G_man_MANS:M${PROG}.1}
CPPFLAGS+= -I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR}/libopcodes

View File

@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
PROG= elfedit
SRCS= elfcomm.c elfedit.c
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
CPPFLAGS+= -I${DIST}/gas -I${DIST}/gas/config
CPPFLAGS+= -I${DIST}
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
@ -20,10 +20,6 @@ COPTS.symbols.c = -Wno-stack-protector
COPTS.stabs.c = -Wno-stack-protector
COPTS.macro.c = -Wno-stack-protector
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
CPPFLAGS+= -I${DIST}/gas -I${DIST}/gas/config
CPPFLAGS+= -I${DIST}
PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR}/libopcodes
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty

View File

@ -1,15 +1,12 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty

View File

@ -1,16 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:10 christos Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
SCRIPTSDIR= /usr/libdata
PROG= ld
SRCS= ${G_OFILES:.o=.c}
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
-DDEFAULT_EMULATION=\"${G_EMUL}\" \
@ -20,6 +9,14 @@ CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-DTOOLBINDIR=\"/usr/bin\" \
-DENABLE_PLUGINS
.include "${.CURDIR}/../common/Makefile.inc"
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
SCRIPTSDIR= /usr/libdata
PROG= ld
SRCS= ${G_OFILES:.o=.c}
COPTS.ldgram.c = -Wno-stack-protector
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= nlmconv
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= nm
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= objcopy
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,9 +1,7 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= objdump
.include <bsd.own.mk>
CPPFLAGS+=-DOBJDUMP_PRIVATE_VECTORS=""
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,9 +1,7 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= ranlib
.include <bsd.own.mk>
COPTS.arparse.c = -Wno-stack-protector
CPPFLAGS+=-Dbin_dummy_emulation=bin_vanilla_emulation

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= readelf
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= size
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= strings
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
PROG= strip
.include <bsd.own.mk>
.include "${.CURDIR}/../common/Makefile.prog"

View File

@ -1,5 +1,6 @@
# $NetBSD: Makefile.inc,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile.inc,v 1.2 2016/01/26 19:38:11 christos Exp $
.include "${.PARSEDIR}/../Makefile.inc"
BINDIR?= /usr/sbin
WARNS?= 1

View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:11 christos Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
DIST= ${TOP}/dist
BFDSUBDIR= lib
PROG= dbsym

View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/01/26 17:27:00 christos Exp $
# $NetBSD: Makefile,v 1.2 2016/01/26 19:38:12 christos Exp $
.include <bsd.own.mk>
.if (defined(HOSTPROG) && \
(${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))) || \
${MKBINUTILS} != "no"
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
DIST= ${TOP}/dist
BFDSUBDIR= lib
PROG= mdsetimage