Page MenuHomeFreeBSD
Files F136372454

D49362.id152274.diff
No OneTemporary
Actions

D49362.id152274.diff
View Options

Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -13591,9 +13591,6 @@
OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
# 20161010: remove link to removed m_getclr(9) macro
OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
-# 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: stand/efi/Makefile.inc
===================================================================
--- stand/efi/Makefile.inc
+++ stand/efi/Makefile.inc
@@ -1,5 +1,3 @@
-.include <src.opts.mk>
-
# Options used when building app-specific efi components
# See conf/kern.mk for the correct set of these
CFLAGS+= -Wformat
@@ -28,11 +26,7 @@
.else
EFI_TARGET= binary
.endif
-.if ${MK_LLVM_BINUTILS} != no
EFI_OBJCOPY?= elfcopy
-.else
-EFI_OBJCOPY?= ${OBJCOPY}
-.endif
# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2024 00:00:00
# for build reproducibility.
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -8124,6 +8124,7 @@
OLD_FILES+=usr/bin/c88
OLD_FILES+=usr/bin/c++
OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/elfcopy
OLD_FILES+=usr/bin/ld
OLD_FILES+=usr/bin/ld.bfd
OLD_FILES+=usr/bin/nm
@@ -8134,6 +8135,7 @@
OLD_FILES+=usr/bin/yacc
OLD_FILES+=usr/share/man/man1/addr2line.1.gz
OLD_FILES+=usr/share/man/man1/c++filt.1.gz
+OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
OLD_FILES+=usr/share/man/man1/nm.1.gz
OLD_FILES+=usr/share/man/man1/readelf.1.gz
OLD_FILES+=usr/share/man/man1/size.1.gz
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -261,7 +261,7 @@
SUBDIR.${MK_TOOLCHAIN}+= lex
SUBDIR.${MK_TOOLCHAIN}+= lorder
SUBDIR.${MK_TOOLCHAIN}+= mkstr
-# ELF Tool Chain objcopy required for EFI objects (PR280771)
+# ELF Tool Chain elfcopy required for EFI objects (PR280771)
SUBDIR.${MK_TOOLCHAIN}+= objcopy
SUBDIR.${MK_TOOLCHAIN}+= rpcgen
SUBDIR.${MK_TOOLCHAIN}+= unifdef
Index: usr.bin/objcopy/Makefile
===================================================================
--- usr.bin/objcopy/Makefile
+++ usr.bin/objcopy/Makefile
@@ -7,22 +7,21 @@
.PATH: ${ELFCOPYDIR}
-.if ${MK_LLVM_BINUTILS} != "no"
-
PROG= elfcopy
+MAN= elfcopy.1
-.else
+.if ${MK_LLVM_BINUTILS} == "no"
-PROG= objcopy
-LINKS= ${BINDIR}/${PROG} ${BINDIR}/strip
-MAN= ${PROG}.1 strip.1
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/objcopy
+LINKS+= ${BINDIR}/${PROG} ${BINDIR}/strip
+MAN+= objcopy.1 strip.1
objcopy.1: elfcopy.1
sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \
-e '/\.Nm elfcopy ,/d' < ${.ALLSRC} > ${.TARGET}
CLEANFILES+= objcopy.1
-.endif # MK_LLVM_BINUTILS != no
+.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
Tue, Nov 18, 11:47 AM (2 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25505201
Default Alt Text
D49362.id152274.diff (3 KB)

Event Timeline