Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/gnu/usr.bin Delete the egcs/binutils 2.9 toolchain. Remove ...



details:   https://anonhg.NetBSD.org/src/rev/117dcbae12ab
branches:  trunk
changeset: 536459:117dcbae12ab
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Sep 16 16:22:15 2002 +0000

description:
Delete the egcs/binutils 2.9 toolchain.  Remove USE_NEW_TOOLCHAIN
conditionals.

diffstat:

 gnu/usr.bin/Makefile                          |   21 +--
 gnu/usr.bin/binutils/Makefile                 |   24 +--
 gnu/usr.bin/binutils/Makefile.inc             |   24 +--
 gnu/usr.bin/binutils/addr2line/Makefile       |   10 +-
 gnu/usr.bin/binutils/ar/Makefile              |   10 +-
 gnu/usr.bin/binutils/c++filt/Makefile         |    9 +-
 gnu/usr.bin/binutils/coffdump/Makefile        |   10 +-
 gnu/usr.bin/binutils/common/Makefile          |   32 +---
 gnu/usr.bin/binutils/nlmconv/Makefile         |   10 +-
 gnu/usr.bin/binutils/nm/Makefile              |   10 +-
 gnu/usr.bin/binutils/objcopy/Makefile         |   10 +-
 gnu/usr.bin/binutils/objdump/Makefile         |   10 +-
 gnu/usr.bin/binutils/ranlib/Makefile          |   10 +-
 gnu/usr.bin/binutils/size/Makefile            |   10 +-
 gnu/usr.bin/binutils/strings/Makefile         |   10 +-
 gnu/usr.bin/binutils/strip/Makefile           |   20 +--
 gnu/usr.bin/egcs/Makefile                     |   20 --
 gnu/usr.bin/egcs/Makefile.cc1                 |   19 --
 gnu/usr.bin/egcs/Makefile.inc                 |   78 ---------
 gnu/usr.bin/egcs/arch/alpha/tconfig.h         |    3 -
 gnu/usr.bin/egcs/arch/alpha/tm.h              |    4 -
 gnu/usr.bin/egcs/arch/arm26/tconfig.h         |    3 -
 gnu/usr.bin/egcs/arch/arm26/tm.h              |    3 -
 gnu/usr.bin/egcs/arch/arm32/tconfig.h         |    3 -
 gnu/usr.bin/egcs/arch/arm32/tm.h              |    3 -
 gnu/usr.bin/egcs/arch/auto-host.h             |  205 --------------------------
 gnu/usr.bin/egcs/arch/config.h                |    4 -
 gnu/usr.bin/egcs/arch/hconfig.h               |    3 -
 gnu/usr.bin/egcs/arch/i386/tconfig.h          |    3 -
 gnu/usr.bin/egcs/arch/i386/tm.h               |    7 -
 gnu/usr.bin/egcs/arch/m68k/tconfig.h          |    3 -
 gnu/usr.bin/egcs/arch/m68k/tm.h               |    7 -
 gnu/usr.bin/egcs/arch/mips/tconfig.h          |    3 -
 gnu/usr.bin/egcs/arch/mips/tm.h               |    3 -
 gnu/usr.bin/egcs/arch/multilib.h              |   12 -
 gnu/usr.bin/egcs/arch/ns32k/tconfig.h         |    3 -
 gnu/usr.bin/egcs/arch/ns32k/tm.h              |    3 -
 gnu/usr.bin/egcs/arch/options.h               |    4 -
 gnu/usr.bin/egcs/arch/powerpc/tconfig.h       |    3 -
 gnu/usr.bin/egcs/arch/powerpc/tm.h            |    3 -
 gnu/usr.bin/egcs/arch/sh3/tconfig.h           |    3 -
 gnu/usr.bin/egcs/arch/sh3/tm.h                |   15 -
 gnu/usr.bin/egcs/arch/sparc/tconfig.h         |    3 -
 gnu/usr.bin/egcs/arch/sparc/tm.h              |    7 -
 gnu/usr.bin/egcs/arch/sparc64/config2.h       |    1 -
 gnu/usr.bin/egcs/arch/sparc64/hconfig.h       |    1 -
 gnu/usr.bin/egcs/arch/sparc64/tconfig.h       |    1 -
 gnu/usr.bin/egcs/arch/sparc64/tm.h            |    1 -
 gnu/usr.bin/egcs/arch/specs.h                 |    4 -
 gnu/usr.bin/egcs/arch/underscore.c            |    7 -
 gnu/usr.bin/egcs/arch/vax/tconfig.h           |    3 -
 gnu/usr.bin/egcs/arch/vax/tm.h                |    3 -
 gnu/usr.bin/egcs/cc/Makefile                  |   18 --
 gnu/usr.bin/egcs/cc1/Makefile                 |   10 -
 gnu/usr.bin/egcs/cc1obj/Makefile              |   15 -
 gnu/usr.bin/egcs/cc1plus/Makefile             |   27 ---
 gnu/usr.bin/egcs/collect2/Makefile            |   11 -
 gnu/usr.bin/egcs/common/Makefile              |  127 ----------------
 gnu/usr.bin/egcs/cpp/Makefile                 |   34 ----
 gnu/usr.bin/egcs/cpp/usr.bin.cpp.sh           |  106 -------------
 gnu/usr.bin/egcs/f771/Makefile                |   29 ---
 gnu/usr.bin/egcs/g++/Makefile                 |   22 --
 gnu/usr.bin/egcs/g77/Makefile                 |   28 ---
 gnu/usr.bin/egcs/gcov/Makefile                |    7 -
 gnu/usr.bin/egcs/gcov/gcov.1                  |  127 ----------------
 gnu/usr.bin/gas.new/Makefile                  |   52 ------
 gnu/usr.bin/gas.new/arch/alpha/Makefile.inc   |    5 -
 gnu/usr.bin/gas.new/arch/alpha/config.h       |  146 ------------------
 gnu/usr.bin/gas.new/arch/alpha/obj-format.h   |    3 -
 gnu/usr.bin/gas.new/arch/alpha/targ-cpu.h     |    3 -
 gnu/usr.bin/gas.new/arch/alpha/targ-env.h     |    3 -
 gnu/usr.bin/gas.new/arch/arm32/Makefile.inc   |    5 -
 gnu/usr.bin/gas.new/arch/arm32/config.h       |  146 ------------------
 gnu/usr.bin/gas.new/arch/arm32/obj-format.h   |    1 -
 gnu/usr.bin/gas.new/arch/arm32/targ-cpu.h     |    1 -
 gnu/usr.bin/gas.new/arch/arm32/targ-env.h     |    1 -
 gnu/usr.bin/gas.new/arch/i386/Makefile.inc    |   10 -
 gnu/usr.bin/gas.new/arch/i386/config.h        |  146 ------------------
 gnu/usr.bin/gas.new/arch/i386/obj-format.h    |    5 -
 gnu/usr.bin/gas.new/arch/i386/targ-cpu.h      |    1 -
 gnu/usr.bin/gas.new/arch/i386/targ-env.h      |    1 -
 gnu/usr.bin/gas.new/arch/m68k/Makefile.inc    |   12 -
 gnu/usr.bin/gas.new/arch/m68k/config.h        |  146 ------------------
 gnu/usr.bin/gas.new/arch/m68k/obj-format.h    |    5 -
 gnu/usr.bin/gas.new/arch/m68k/targ-cpu.h      |    1 -
 gnu/usr.bin/gas.new/arch/m68k/targ-env.h      |    1 -
 gnu/usr.bin/gas.new/arch/mips/Makefile.inc    |   18 --
 gnu/usr.bin/gas.new/arch/mips/config.h        |  146 ------------------
 gnu/usr.bin/gas.new/arch/mips/itbl-cpu.h      |    3 -
 gnu/usr.bin/gas.new/arch/mips/obj-format.h    |    3 -
 gnu/usr.bin/gas.new/arch/mips/targ-cpu.h      |    3 -
 gnu/usr.bin/gas.new/arch/mips/targ-env.h      |    3 -
 gnu/usr.bin/gas.new/arch/ns32k/Makefile.inc   |    5 -
 gnu/usr.bin/gas.new/arch/ns32k/config.h       |  146 ------------------
 gnu/usr.bin/gas.new/arch/ns32k/obj-format.h   |    1 -
 gnu/usr.bin/gas.new/arch/ns32k/targ-cpu.h     |    1 -
 gnu/usr.bin/gas.new/arch/ns32k/targ-env.h     |    1 -
 gnu/usr.bin/gas.new/arch/powerpc/Makefile.inc |    5 -
 gnu/usr.bin/gas.new/arch/powerpc/config.h     |  146 ------------------
 gnu/usr.bin/gas.new/arch/powerpc/obj-format.h |    3 -
 gnu/usr.bin/gas.new/arch/powerpc/targ-cpu.h   |    3 -
 gnu/usr.bin/gas.new/arch/powerpc/targ-env.h   |    3 -
 gnu/usr.bin/gas.new/arch/sh3/Makefile.inc     |   24 ---
 gnu/usr.bin/gas.new/arch/sh3/config.h         |  159 --------------------
 gnu/usr.bin/gas.new/arch/sh3/obj-format.h     |    7 -
 gnu/usr.bin/gas.new/arch/sh3/targ-cpu.h       |    3 -
 gnu/usr.bin/gas.new/arch/sh3/targ-env.h       |    3 -
 gnu/usr.bin/gas.new/arch/sparc/Makefile.inc   |   10 -
 gnu/usr.bin/gas.new/arch/sparc/config.h       |  146 ------------------
 gnu/usr.bin/gas.new/arch/sparc/obj-format.h   |    5 -
 gnu/usr.bin/gas.new/arch/sparc/targ-cpu.h     |    1 -
 gnu/usr.bin/gas.new/arch/sparc/targ-env.h     |    1 -
 gnu/usr.bin/gas.new/arch/sparc64/Makefile.inc |    5 -
 gnu/usr.bin/gas.new/arch/sparc64/config.h     |  146 ------------------
 gnu/usr.bin/gas.new/arch/sparc64/obj-format.h |    1 -
 gnu/usr.bin/gas.new/arch/sparc64/targ-cpu.h   |    1 -
 gnu/usr.bin/gas.new/arch/sparc64/targ-env.h   |    1 -
 gnu/usr.bin/gas.new/arch/vax/Makefile.inc     |    5 -
 gnu/usr.bin/gas.new/arch/vax/config.h         |  146 ------------------
 gnu/usr.bin/gas.new/arch/vax/obj-format.h     |    1 -
 gnu/usr.bin/gas.new/arch/vax/targ-cpu.h       |    1 -
 gnu/usr.bin/gas.new/arch/vax/targ-env.h       |    1 -
 gnu/usr.bin/gdb/GDBvn.texi                    |    2 -
 gnu/usr.bin/gdb/Makefile                      |  142 +-----------------
 gnu/usr.bin/gdb/config.h                      |  152 -------------------
 gnu/usr.bin/gdb/mkinit.sh                     |   50 ------
 gnu/usr.bin/gdb/version.c                     |    5 -
 gnu/usr.bin/gdb/xm.h                          |    3 -
 gnu/usr.bin/gprof/Makefile                    |   28 ---
 gnu/usr.bin/gprof/gconfig.h                   |   14 -
 gnu/usr.bin/ld.new/Makefile                   |  165 --------------------
 gnu/usr.bin/ld.new/config.h                   |   53 ------
 132 files changed, 32 insertions(+), 3675 deletions(-)

diffs (truncated from 4350 to 300 lines):

diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/Makefile
--- a/gnu/usr.bin/Makefile      Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/Makefile      Mon Sep 16 16:22:15 2002 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.107 2002/02/02 03:04:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.108 2002/09/16 16:22:15 thorpej Exp $
 
 # for OBJECT_FMT
 .include <bsd.own.mk>
 
-SUBDIR+=       bc binutils c89 cvs dc diff diff3 egcs gas.new gawk gcc grep
-SUBDIR+=       gprof groff gzip ld.new rcs sdiff send-pr texinfo
+SUBDIR+=       bc binutils c89 cvs dc diff diff3 gawk gcc grep
+SUBDIR+=       groff gzip rcs sdiff send-pr texinfo
 
 SUBDIR+=       cpio
 SUBDIR+=       tar
@@ -12,19 +12,4 @@
 
 SUBDIR+=       sim .WAIT gdb
 
-.if (${MACHINE_ARCH} == "m68k" && ${OBJECT_FMT} != "ELF") ||   \
-    (${MACHINE_ARCH} == "ns32k")
-SUBDIR+=       gas
-.endif
-
-.if (${OBJECT_FMT} != "ELF") &&                \
-    ((${MACHINE_ARCH} == "arm32") ||   \
-     (${MACHINE_ARCH} == "i386") ||    \
-     (${MACHINE_ARCH} == "m68k") ||    \
-     (${MACHINE_ARCH} == "ns32k") ||   \
-     (${MACHINE_ARCH} == "sparc") ||   \
-     (${MACHINE_ARCH} == "vax"))
-SUBDIR+=       ld
-.endif
-
 .include <bsd.subdir.mk>
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/Makefile
--- a/gnu/usr.bin/binutils/Makefile     Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/Makefile     Mon Sep 16 16:22:15 2002 +0000
@@ -1,9 +1,7 @@
-#      $NetBSD: Makefile,v 1.19 2002/06/18 08:21:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.20 2002/09/16 16:22:16 thorpej Exp $
 
 .include <bsd.own.mk>
 
-.if defined(USE_NEW_TOOLCHAIN)
-
 .if ${MKBFD} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
 .include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
 
@@ -11,24 +9,4 @@
 SUBDIR:=       ${SUBDIR:O} # alphabetize
 .endif # MKBFD != no
 
-.else
-#
-# XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
-#
-.if (${MACHINE_ARCH} != sparc64)
-SUBDIR=                common .WAIT addr2line ar c++filt nm objcopy objdump ranlib \
-               size strings strip
-
-.endif
-
-TEXINFO=       binutils.info
-INFOFLAGS=     -I${.CURDIR}/../../dist/binutils
-.PATH: ${.CURDIR}/../../dist/binutils
-
-.include <bsd.info.mk>
-#
-# XXX - END - Old toolchain build goop - delete when everything migrated - XXX
-#
-.endif
-
 .include <bsd.subdir.mk>
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/Makefile.inc
--- a/gnu/usr.bin/binutils/Makefile.inc Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/Makefile.inc Mon Sep 16 16:22:15 2002 +0000
@@ -1,37 +1,15 @@
-#      $NetBSD: Makefile.inc,v 1.10 2001/11/26 18:19:47 jmc Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2002/09/16 16:22:16 thorpej Exp $
 
 .if !defined(__MAKEFILE_INC_INCLUDED__)
 __MAKEFILE_INC_INCLUDED__=1
 
 .include <bsd.own.mk>
 
-.if defined(USE_NEW_TOOLCHAIN)
-
 GCPPFLAGS=     ${G_DEFS} ${G_INCLUDES}
 CPPFLAGS+=     ${GCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GCPPFLAGS:M-I*:N-I.*} \
                -I${TOP}/lib/libbfd/arch/${MACHINE_ARCH} \
                -DLOCALEDIR=\"${LOCALEDIR}\"
 
-.else
-#
-# XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
-#
-CPPFLAGS+=     -I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/../common \
-               -I${BFDOBJ} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include \
-               -DHAVE_CONFIG_H
-DPADD+=                ${LIBCOMMONDIR}/libcommon.a ${BFDOBJ}/libbfd_pic.a
-LDADD+=                -L${LIBCOMMONDIR} -lcommon -L${BFDOBJ} -lbfd
-
-DIST=          ${.CURDIR}/../../../dist
-BFDOBJ!=       cd ${.CURDIR}/../../../lib/libbfd && ${PRINTOBJDIR}
-LIBCOMMONDIR!= cd ${.CURDIR}/../common && ${PRINTOBJDIR}
-
-.PATH: ${DIST}/binutils
-#
-# XXX - END - Old toolchain build goop - delete when everything migrated - XXX
-#
-.endif
-
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/addr2line/Makefile
--- a/gnu/usr.bin/binutils/addr2line/Makefile   Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/addr2line/Makefile   Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2001/08/06 19:12:00 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/16 16:22:17 thorpej Exp $
 
 PROG=          addr2line
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          addr2line.c
-MAN=           addr2line.1
-
-.include <bsd.prog.mk>
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/ar/Makefile
--- a/gnu/usr.bin/binutils/ar/Makefile  Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/ar/Makefile  Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2001/08/06 19:12:00 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/16 16:22:17 thorpej Exp $
 
 PROG=          ar
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          ar.c not-ranlib.c
-MAN=           ar.1
-
-.include <bsd.prog.mk>
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/c++filt/Makefile
--- a/gnu/usr.bin/binutils/c++filt/Makefile     Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/c++filt/Makefile     Mon Sep 16 16:22:15 2002 +0000
@@ -1,17 +1,12 @@
-#      $NetBSD: Makefile,v 1.10 2001/08/06 19:12:00 tv Exp $
+#      $NetBSD: Makefile,v 1.11 2002/09/16 16:22:17 thorpej Exp $
 
 PROG=          c++filt
 CPPFLAGS+=     -DMAIN
 CLEANFILES+=   c++filt.1
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          cplus-dem.c underscore.c
-
-.include <bsd.prog.mk>
-.endif
 
 .PATH: ${DIST}/libiberty
 
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/coffdump/Makefile
--- a/gnu/usr.bin/binutils/coffdump/Makefile    Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/coffdump/Makefile    Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.1 2002/06/18 08:21:59 itojun Exp $
+#      $NetBSD: Makefile,v 1.2 2002/09/16 16:22:18 thorpej Exp $
 
 PROG=          coffdump
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          coffdump.c coffgrok.c
-NOMAN=         yes
-
-.include <bsd.prog.mk>
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/common/Makefile
--- a/gnu/usr.bin/binutils/common/Makefile      Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/common/Makefile      Mon Sep 16 16:22:15 2002 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile,v 1.10 2001/12/12 01:49:02 tv Exp $
+#      $NetBSD: Makefile,v 1.11 2002/09/16 16:22:18 thorpej Exp $
+
 .include <bsd.own.mk>
 
-.if defined(USE_NEW_TOOLCHAIN)
-
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
 
 TOP=           ${.CURDIR}/../../..
@@ -14,30 +13,3 @@
 .PATH: ${DIST}/binutils
 
 .include <bsd.info.mk>
-
-.else
-#
-# XXX - BEGIN - Old toolchain build goop - delete when everything migrated - XXX
-#
-LIB=           common
-
-SRCS=          arparse.y arlex.l arsup.c bucomm.c version.c filemode.c \
-               rddbg.c debug.c stabs.c ieee.c rdcoff.c wrstabs.c
-CPPFLAGS+=     -DTARGET='"${MACHINE_GNU_ARCH}--netbsd"'
-YHEADER=1
-
-NOPROFILE=     # defined
-NOPIC=         # defined
-NOLINT=                # defined
-
-# only needed during build
-libinstall::
-
-# mention explicit dependency, so arparse.h will appear timely
-arlex.c: arparse.h
-
-.include <bsd.lib.mk>
-#
-# XXX - END - Old toolchain build goop - delete when everything migrated - XXX
-#
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/nlmconv/Makefile
--- a/gnu/usr.bin/binutils/nlmconv/Makefile     Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/nlmconv/Makefile     Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.4 2002/06/18 08:21:59 itojun Exp $
+#      $NetBSD: Makefile,v 1.5 2002/09/16 16:22:19 thorpej Exp $
 
 PROG=          nlmconv
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          nlmconv.c nlmheader.y 
-MAN=           nlmconv.1
-
-.include <bsd.prog.mk>
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/nm/Makefile
--- a/gnu/usr.bin/binutils/nm/Makefile  Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/nm/Makefile  Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2001/08/06 19:12:05 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/16 16:22:19 thorpej Exp $
 
 PROG=          nm
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          nm.c
-MAN=           nm.1
-
-.include <bsd.prog.mk>
-.endif
diff -r 4d2e1921ec1b -r 117dcbae12ab gnu/usr.bin/binutils/objcopy/Makefile
--- a/gnu/usr.bin/binutils/objcopy/Makefile     Mon Sep 16 14:12:04 2002 +0000
+++ b/gnu/usr.bin/binutils/objcopy/Makefile     Mon Sep 16 16:22:15 2002 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2001/08/06 19:12:05 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/16 16:22:20 thorpej Exp $
 
 PROG=          objcopy
 
 .include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../common/Makefile.prog"
-.else
-SRCS=          objcopy.c not-strip.c
-MAN=           objcopy.1
-
-.include <bsd.prog.mk>
-.endif



Home | Main Index | Thread Index | Old Index