Date: Mon, 3 Oct 2016 17:49:26 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306649 - in head: . gnu/usr.bin/binutils share/mk tools/build/mk tools/build/options usr.bin/elfcopy Message-ID: <201610031749.u93HnQFV030260@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Mon Oct 3 17:49:26 2016 New Revision: 306649 URL: https://svnweb.freebsd.org/changeset/base/306649 Log: Retire WITHOUT_ELFCOPY_AS_OBJCOPY option In FreeBSD 11 ELF Tool Chain's elfcopy is installed as objcopy by default, with the option to switch back to GNU objcopy by setting WITHOUT_ELFCOPY_AS_OBJCOPY in make.conf. We plan to remove the outdated in-tree binutils in FreeBSD 12, so remove the temporary transition aid. Reviewed by: brooks, imp Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D7337 Deleted: head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY Modified: head/ObsoleteFiles.inc head/UPDATING head/gnu/usr.bin/binutils/Makefile head/share/mk/src.opts.mk head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/elfcopy/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Oct 3 17:34:50 2016 (r306648) +++ head/ObsoleteFiles.inc Mon Oct 3 17:49:26 2016 (r306649) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired +OLD_FILES+=usr/bin/elfcopy +OLD_FILES+=usr/share/man/man1/elfcopy.1.gz # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue OLD_FILES+=usr/tests/sys/kqueue/kqtest OLD_FILES+=usr/tests/sys/kqueue/kqueue_test Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Oct 3 17:34:50 2016 (r306648) +++ head/UPDATING Mon Oct 3 17:49:26 2016 (r306649) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20161003: + The WITHOUT_ELFCOPY_AS_OBJCOPY src.conf(5) knob has been retired. + ELF Tool Chain's elfcopy is always installed as /usr/bin/objcopy. + 20160924: Relocatable object files with the extension of .So have been renamed to use an extension of .pico instead. The purpose of this change is Modified: head/gnu/usr.bin/binutils/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/Makefile Mon Oct 3 17:34:50 2016 (r306648) +++ head/gnu/usr.bin/binutils/Makefile Mon Oct 3 17:49:26 2016 (r306649) @@ -9,17 +9,12 @@ SUBDIR= doc\ libbinutils \ as \ ld \ - ${_objcopy} \ - objdump \ + objdump -.if ${MK_ELFCOPY_AS_OBJCOPY} == "no" -_objcopy= objcopy -.endif SUBDIR_DEPEND_libbinutils=libbfd # for bfdver.h SUBDIR_DEPEND_as=libbfd libiberty libopcodes SUBDIR_DEPEND_ld=libbfd libiberty -SUBDIR_DEPEND_objcopy=libbfd libiberty libbinutils SUBDIR_DEPEND_objdump=libbfd libiberty libbinutils libopcodes .if !make(install) Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Mon Oct 3 17:34:50 2016 (r306648) +++ head/share/mk/src.opts.mk Mon Oct 3 17:49:26 2016 (r306649) @@ -82,7 +82,6 @@ __DEFAULT_YES_OPTIONS = \ DYNAMICROOT \ ED_CRYPTO \ EE \ - ELFCOPY_AS_OBJCOPY \ ELFTOOLCHAIN_BOOTSTRAP \ EXAMPLES \ FDT \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Oct 3 17:34:50 2016 (r306648) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Oct 3 17:49:26 2016 (r306649) @@ -220,9 +220,6 @@ OLD_DIRS+=usr/share/examples/bhyve OLD_FILES+=usr/bin/as OLD_FILES+=usr/bin/ld OLD_FILES+=usr/bin/ld.bfd -.if ${MK_ELFCOPY_AS_OBJCOPY} == no -OLD_FILES+=usr/bin/objcopy -.endif OLD_FILES+=usr/bin/objdump OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn @@ -421,9 +418,6 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw OLD_FILES+=usr/share/man/man1/as.1.gz OLD_FILES+=usr/share/man/man1/ld.1.gz -.if ${MK_ELFCOPY_AS_OBJCOPY} == no -OLD_FILES+=usr/share/man/man1/objcopy.1.gz -.endif OLD_FILES+=usr/share/man/man1/objdump.1.gz OLD_FILES+=usr/share/man/man7/as.7.gz OLD_FILES+=usr/share/man/man7/ld.7.gz @@ -8024,6 +8018,7 @@ OLD_FILES+=usr/bin/c++filt OLD_FILES+=usr/bin/ld OLD_FILES+=usr/bin/ld.bfd OLD_FILES+=usr/bin/nm +OLD_FILES+=usr/bin/objcopy OLD_FILES+=usr/bin/readelf OLD_FILES+=usr/bin/size OLD_FILES+=usr/bin/strings @@ -8036,10 +8031,7 @@ OLD_FILES+=usr/share/man/man1/readelf.1. OLD_FILES+=usr/share/man/man1/size.1.gz OLD_FILES+=usr/share/man/man1/strings.1.gz OLD_FILES+=usr/share/man/man1/strip.1.gz -.if ${MK_ELFCOPY_AS_OBJCOPY} != no -OLD_FILES+=usr/bin/objcopy OLD_FILES+=usr/share/man/man1/objcopy.1.gz -.endif OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y @@ -8349,10 +8341,6 @@ OLD_FILES+=usr/tests/usr.bin/yacc/yacc/v OLD_FILES+=usr/tests/usr.bin/yacc/yacc_tests OLD_DIRS+=usr/tests/usr.bin/yacc .endif -.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no -OLD_FILES+=usr/bin/elfcopy -OLD_FILES+=usr/share/man/man1/elfcopy.1.gz -.endif .if ${MK_UNBOUND} == no OLD_FILES+=etc/rc.d/local_unbound Modified: head/usr.bin/elfcopy/Makefile ============================================================================== --- head/usr.bin/elfcopy/Makefile Mon Oct 3 17:34:50 2016 (r306648) +++ head/usr.bin/elfcopy/Makefile Mon Oct 3 17:49:26 2016 (r306649) @@ -7,15 +7,11 @@ ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} -.if ${MK_ELFCOPY_AS_OBJCOPY} != "no" PROG= objcopy objcopy.1: elfcopy.1 sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \ -e 's/\.Nm elfcopy/.Nm objcopy/' < ${.ALLSRC} > ${.TARGET} CLEANFILES+= objcopy.1 -.else -PROG= elfcopy -.endif SRCS= archive.c ascii.c binary.c main.c pe.c sections.c segments.c symbols.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610031749.u93HnQFV030260>