Page MenuHomeFreeBSD
Files F144620144

D7337.1775824034.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D7337.1775824034.diff
View Options

Index: head/ObsoleteFiles.inc
===================================================================
--- head/ObsoleteFiles.inc
+++ head/ObsoleteFiles.inc
@@ -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
Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -31,6 +31,10 @@
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
Index: head/gnu/usr.bin/binutils/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/Makefile
+++ head/gnu/usr.bin/binutils/Makefile
@@ -9,17 +9,12 @@
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)
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -82,7 +82,6 @@
DYNAMICROOT \
ED_CRYPTO \
EE \
- ELFCOPY_AS_OBJCOPY \
ELFTOOLCHAIN_BOOTSTRAP \
EXAMPLES \
FDT \
Index: head/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc
+++ head/tools/build/mk/OptionalObsoleteFiles.inc
@@ -220,9 +220,6 @@
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_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/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/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_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
Index: head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
===================================================================
--- head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
+++ head/tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to build and install
-.Xr objcopy 1
-from GNU Binutils, instead of the one from ELF Tool Chain.
-This option is provided as a transition aid and will be removed in due time.
Index: head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
===================================================================
--- head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
+++ head/tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build and install ELF Tool Chain's elfcopy as
-.Xr objcopy 1 ,
-instead of the one from GNU Binutils.
Index: head/usr.bin/elfcopy/Makefile
===================================================================
--- head/usr.bin/elfcopy/Makefile
+++ head/usr.bin/elfcopy/Makefile
@@ -7,15 +7,11 @@
.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

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 10, 12:27 PM (1 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28315935
Default Alt Text
D7337.1775824034.diff (5 KB)

Event Timeline