gprof: Replace BSD gprof and gprof4 with gnu gprof

This stops old gprof and gprof4 from getting built, and links gnu prof
to /usr/bin.

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a14e5e1..7cf4bd3 100644 (file)
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -68,7 +68,6 @@ SUBDIR=       alias \
        getconf \
        getent \
        getopt \
-       gprof \
        gzip \
        head \
        hexdump \
@@ -259,7 +258,6 @@ SUBDIR+=vacation
 # Things that don't compile on x86_64 or are i386 specific:
 SUBDIR+=doscmd \
        gcore \
-       gprof4 \
        ncplist \
        ncplogin \
        smbutil

diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index a205fac..5258a03 100644 (file)
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -25,6 +25,7 @@ LINKS+=       ${BINDIR}/objformat ${BINDIR}/ar
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/as
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/c++filt
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/elfedit
+LINKS+=        ${BINDIR}/objformat ${BINDIR}/gprof
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/ld
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/nm
 LINKS+=        ${BINDIR}/objformat ${BINDIR}/objcopy

diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index c3af402..ee152b8 100644 (file)
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -68,6 +68,7 @@ static struct command commands[] = {
        {"as",          BINUTILS},
        {"c++filt",     BINUTILS},
        {"elfedit",     BINUTILS},
+       {"gprof",       BINUTILS},
        {"ld",          BINUTILS},
        {"nm",          BINUTILS},
        {"objcopy",     BINUTILS},