Attachment 154868 Details for Bug 198950 – Makefile change to use ELF toolchain readelf

[patch] Makefile change to use ELF toolchain readelf

elftc_readelf.diff (text/plain), 6.22 KB, created by Ed Maste on 2015-03-27 15:28:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2015-03-27 15:28:05 UTC

Size: 6.22 KB

patch

obsolete

>commit 171130c691082d9974cb11e8150811d3fc3709ca
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Tue Dec 16 11:47:14 2014 -0500
>
>    Connect elftoolchain readelf(1) to the build
>    
>    Sponsored by:	The FreeBSD Foundation
>
>diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
>index a41e72e..1c863df 100644
>--- a/gnu/usr.bin/binutils/Makefile
>+++ b/gnu/usr.bin/binutils/Makefile
>@@ -1,29 +1,30 @@
> # $FreeBSD$
> 
> .include <src.opts.mk>
> 
> SUBDIR=	doc\
> 	libiberty \
> 	libbfd \
> 	libopcodes \
> 	libbinutils \
> 	${_addr2line} \
> 	as \
> 	ld \
> 	${_nm} \
> 	objcopy \
> 	objdump \
>-	readelf \
>+	${_readelf} \
> 	${_size} \
> 	${_strings} \
> 	${_strip}
> 
> .if ${MK_ELFTOOLCHAIN_TOOLS} == "no"
> _addr2line=	addr2line
> _nm=		nm
>+_readelf=	readelf
> _size=		size
> _strings=	strings
> _strip=		strip
> .endif
> 
> .include <bsd.subdir.mk>
>diff --git a/usr.bin/Makefile b/usr.bin/Makefile
>index aee201a..b1e4b83 100644
>--- a/usr.bin/Makefile
>+++ b/usr.bin/Makefile
>@@ -1,423 +1,425 @@
> #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
> # $FreeBSD$
> 
> .include <src.opts.mk>
> 
> # XXX MISSING:		deroff diction graph learn plot
> #			spell spline struct xsend
> # XXX Use GNU versions: diff ld patch
> # Moved to secure: bdes
> #
> 
> SUBDIR=	${_addr2line} \
> 	alias \
> 	apply \
> 	asa \
> 	awk \
> 	banner \
> 	basename \
> 	brandelf \
> 	bsdiff \
> 	bzip2 \
> 	bzip2recover \
> 	cap_mkdb \
> 	chat \
> 	chpass \
> 	cksum \
> 	${_clang} \
> 	cmp \
> 	col \
> 	colldef \
> 	colrm \
> 	column \
> 	comm \
> 	compress \
> 	cpuset \
> 	csplit \
> 	ctlstat \
> 	cut \
> 	demandoc \
> 	dirname \
> 	dpv \
> 	du \
> 	elf2aout \
> 	${_elfcopy} \
> 	elfdump \
> 	enigma \
> 	env \
> 	expand \
> 	false \
> 	fetch \
> 	find \
> 	fmt \
> 	fold \
> 	fstat \
> 	fsync \
> 	gcore \
> 	gencat \
> 	getconf \
> 	getent \
> 	getopt \
> 	grep \
> 	gzip \
> 	head \
> 	hexdump \
> 	${_iconv} \
> 	id \
> 	ipcrm \
> 	ipcs \
> 	join \
> 	jot \
> 	${_kdump} \
> 	keylogin \
> 	keylogout \
> 	killall \
> 	ktrace \
> 	ktrdump \
> 	lam \
> 	lastcomm \
> 	ldd \
> 	leave \
> 	less \
> 	lessecho \
> 	lesskey \
> 	limits \
> 	locale \
> 	lock \
> 	lockf \
> 	logger \
> 	login \
> 	logins \
> 	logname \
> 	look \
> 	lorder \
> 	lsvfs \
> 	lzmainfo \
> 	m4 \
> 	${_makewhatis} \
> 	${_man} \
> 	mandoc \
> 	mesg \
> 	minigzip \
> 	ministat \
> 	${_mkcsmapper} \
> 	mkdep \
> 	${_mkesdb} \
> 	mkfifo \
> 	mkimg \
> 	mklocale \
> 	mktemp \
> 	mkulzma \
> 	mkuzip \
> 	mt \
> 	ncal \
> 	netstat \
> 	newgrp \
> 	nfsstat \
> 	nice \
> 	nl \
> 	${_nm} \
> 	nohup \
> 	opieinfo \
> 	opiekey \
> 	opiepasswd \
> 	pagesize \
> 	passwd \
> 	paste \
> 	patch \
> 	pathchk \
> 	perror \
> 	pr \
> 	printenv \
> 	printf \
> 	procstat \
> 	protect \
> 	rctl \
>+	${_readelf} \
> 	renice \
> 	rev \
> 	revoke \
> 	rpcinfo \
> 	rs \
> 	rup \
> 	rusers \
> 	rwall \
> 	script \
> 	sed \
> 	send-pr \
> 	seq \
> 	shar \
> 	showmount \
> 	${_size} \
> 	sockstat \
> 	soeliminate \
> 	sort \
> 	split \
> 	stat \
> 	stdbuf \
> 	${_strings} \
> 	su \
> 	systat \
> 	tabs \
> 	tail \
> 	tar \
> 	tcopy \
> 	tee \
> 	${_tests} \
> 	time \
> 	timeout \
> 	tip \
> 	top \
> 	touch \
> 	tput \
> 	tr \
> 	true \
> 	truncate \
> 	${_truss} \
> 	tset \
> 	tsort \
> 	tty \
> 	uname \
> 	unexpand \
> 	uniq \
> 	unzip \
> 	units \
> 	unvis \
> 	uudecode \
> 	uuencode \
> 	vis \
> 	vmstat \
> 	w \
> 	wall \
> 	wc \
> 	what \
> 	whereis \
> 	which \
> 	whois \
> 	write \
> 	xargs \
> 	xinstall \
> 	xo \
> 	xz \
> 	xzdec \
> 	yes \
> 	${_ypcat} \
> 	${_ypmatch} \
> 	${_ypwhich}
> 
> # NB: keep these sorted by MK_* knobs
> 
> .if ${MK_AT} != "no"
> SUBDIR+=	at
> .endif
> 
> .if ${MK_ATM} != "no"
> SUBDIR+=	atm
> .endif
> 
> .if ${MK_BLUETOOTH} != "no"
> SUBDIR+=	bluetooth
> .endif
> 
> .if ${MK_BSD_CPIO} != "no"
> SUBDIR+=	cpio
> .endif
> 
> .if ${MK_CALENDAR} != "no"
> SUBDIR+=	calendar
> .endif
> 
> .if ${MK_CLANG} != "no"
> _clang=		clang
> .endif
> 
> .if ${MK_EE} != "no"
> SUBDIR+=	ee
> .endif
> 
> .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
> _addr2line=	addr2line
> _elfcopy=	elfcopy
> _nm=		nm
>+_readelf=	readelf
> _size=		size
> _strings=	strings
> .endif
> 
> .if ${MK_FILE} != "no"
> SUBDIR+=	file
> .endif
> 
> .if ${MK_FINGER} != "no"
> SUBDIR+=	finger
> .endif
> 
> .if ${MK_FMAKE} != "no"
> SUBDIR+=	make
> .endif
> 
> .if ${MK_FTP} != "no"
> SUBDIR+=	ftp
> .endif
> 
> .if ${MK_GPL_DTC} != "yes"
> SUBDIR+=	dtc
> .endif
> 
> .if ${MK_GROFF} != "no"
> SUBDIR+=	vgrind
> .endif
> 
> .if ${MK_HESIOD} != "no"
> SUBDIR+=	hesinfo
> .endif
> 
> .if ${MK_ICONV} != "no"
> _iconv=		iconv
> _mkcsmapper=	mkcsmapper
> _mkesdb=	mkesdb
> .endif
> 
> .if ${MK_ISCSI} != "no"
> SUBDIR+=	iscsictl
> .endif
> 
> .if ${MK_KDUMP} != "no"
> SUBDIR+=        kdump
> SUBDIR+=        truss
> .endif
> 
> .if ${MK_KERBEROS_SUPPORT} != "no"
> SUBDIR+=	compile_et
> .endif
> 
> .if ${MK_LDNS_UTILS} != "no"
> SUBDIR+=	drill
> SUBDIR+=	host
> .endif
> 
> .if ${MK_LOCATE} != "no"
> SUBDIR+=	locate
> .endif
> 
> # XXX msgs?
> .if ${MK_MAIL} != "no"
> SUBDIR+=	biff
> SUBDIR+=	from
> SUBDIR+=	mail
> SUBDIR+=	msgs
> .endif
> 
> .if ${MK_MAKE} != "no"
> SUBDIR+=	bmake
> .endif
> 
> .if ${MK_MAN_UTILS} != "no"
> SUBDIR+=	catman
> _makewhatis=	makewhatis
> _man=		man
> .endif
> 
> .if ${MK_NETCAT} != "no"
> SUBDIR+=	nc
> .endif
> 
> .if ${MK_NIS} != "no"
> SUBDIR+=	ypcat
> SUBDIR+=	ypmatch
> SUBDIR+=	ypwhich
> .endif
> 
> .if ${MK_OPENSSH} != "no"
> SUBDIR+=	ssh-copy-id
> .endif
> 
> .if ${MK_OPENSSL} != "no"
> SUBDIR+=	bc
> SUBDIR+=	chkey
> SUBDIR+=	dc
> SUBDIR+=	newkey
> .endif
> 
> .if ${MK_QUOTAS} != "no"
> SUBDIR+=	quota
> .endif
> 
> .if ${MK_RCMDS} != "no"
> SUBDIR+=	rlogin
> SUBDIR+=	rsh
> SUBDIR+=	ruptime
> SUBDIR+=	rwho
> .endif
> 
> .if ${MK_SENDMAIL} != "no"
> SUBDIR+=	vacation
> .endif
> 
> .if ${MK_TALK} != "no"
> SUBDIR+=	talk
> .endif
> 
> .if ${MK_TELNET} != "no"
> SUBDIR+=	telnet
> .endif
> 
> .if ${MK_TESTS} != "no"
> _tests=		tests
> .endif
> 
> .if ${MK_TEXTPROC} != "no"
> SUBDIR+=	checknr
> SUBDIR+=	colcrt
> SUBDIR+=	ul
> .endif
> 
> .if ${MK_TFTP} != "no"
> SUBDIR+=	tftp
> .endif
> 
> .if ${MK_TOOLCHAIN} != "no"
> SUBDIR+=	ar
> SUBDIR+=	c89
> SUBDIR+=	c99
> SUBDIR+=	ctags
> SUBDIR+=	file2c
> SUBDIR+=	gprof
> SUBDIR+=	indent
> SUBDIR+=	lex
> SUBDIR+=	mkstr
> SUBDIR+=	rpcgen
> SUBDIR+=	unifdef
> SUBDIR+=	xlint
> SUBDIR+=	xstr
> SUBDIR+=	yacc
> .endif
> 
> .if ${MK_VI} != "no"
> SUBDIR+=	vi
> .endif
> 
> .if ${MK_VT} != "no"
> SUBDIR+=	vtfontcvt
> .endif
> 
> .if ${MK_USB} != "no"
> SUBDIR+=	usbhidaction
> SUBDIR+=	usbhidctl
> .endif
> 
> .if ${MK_UTMPX} != "no"
> SUBDIR+=	last
> SUBDIR+=	users
> SUBDIR+=	who
> .endif
> 
> .if ${MK_SVN} == "yes" || ${MK_SVNLITE} == "yes"
> SUBDIR+=	svn
> .endif
> 
> .include <bsd.arch.inc.mk>
> 
> SUBDIR:=	${SUBDIR:O}
> 
> SUBDIR_PARALLEL=
> 
> .include <bsd.subdir.mk>

Actions: View | Diff

Attachments on bug 198950: 154868