From ab11c169b56e696829269b95bf7747133c90b632 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 22 Sep 2001 03:34:17 +0000 Subject: [PATCH] objcopy -> ${OBJCOPY}; remove redundant definitions of OBJCOPY?= (it is now in bsd.own.mk). --- sys/arch/alpha/stand/Makefile.bootxx | 4 ++-- sys/arch/alpha/stand/boot/Makefile | 4 ++-- sys/arch/alpha/stand/bootxx/Makefile | 4 ++-- sys/arch/alpha/stand/netboot/Makefile | 4 ++-- sys/arch/alpha/stand/ustarboot/Makefile | 4 ++-- sys/arch/arm26/stand/Makefile.buildboot | 3 +-- sys/arch/atari/stand/bootxx/Makefile | 4 ++-- sys/arch/atari/stand/xxboot/Makefile.inc | 4 ++-- sys/arch/i386/bioscall/Makefile | 4 ++-- sys/arch/i386/stand/Makefile.booters | 6 +++--- sys/arch/macppc/stand/ofwboot/Makefile | 3 +-- sys/arch/mipsco/stand/Makefile.booters | 4 ++-- sys/arch/news68k/stand/boot/Makefile | 3 +-- sys/arch/newsmips/stand/boot/Makefile | 3 +-- sys/arch/sparc/stand/boot/Makefile | 4 +--- sys/arch/sparc/stand/ofwboot/Makefile | 3 +-- sys/arch/x68k/stand/mboot/Makefile | 3 +-- sys/arch/x68k/stand/xxboot/Makefile | 3 +-- sys/arch/x68k/usr.bin/loadkmap/Makefile | 4 +--- 19 files changed, 30 insertions(+), 41 deletions(-) diff --git a/sys/arch/alpha/stand/Makefile.bootxx b/sys/arch/alpha/stand/Makefile.bootxx index d9c8047407d4..abfd45ee7b94 100644 --- a/sys/arch/alpha/stand/Makefile.bootxx +++ b/sys/arch/alpha/stand/Makefile.bootxx @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootxx,v 1.3 1999/08/18 20:00:27 cgd Exp $ +# $NetBSD: Makefile.bootxx,v 1.4 2001/09/22 03:34:17 tv Exp $ SRCS = start.S bootxx.c booted_dev.c blkdev.c prom.c prom_disp.S \ putstr.c panic_putstr.c @@ -23,7 +23,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}: ${PROG}.sym @echo creating ${PROG} from ${PROG}.sym... - @objcopy --output-target=binary ${PROG}.sym ${PROG} + @${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG} @chmod 644 ${PROG} @ls -l ${PROG} @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${PRIMARY_MAX_LOAD} \ diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile index d5484ca0a0ed..dde98e625680 100644 --- a/sys/arch/alpha/stand/boot/Makefile +++ b/sys/arch/alpha/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2000/09/26 05:13:36 simonb Exp $ +# $NetBSD: Makefile,v 1.31 2001/09/22 03:34:17 tv Exp $ PROG = boot @@ -20,7 +20,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}: ${PROG}.sym @echo creating ${PROG} from ${PROG}.sym... - @objcopy --output-target=binary ${PROG}.sym ${PROG} + @${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG} @chmod 644 ${PROG} @ls -l ${PROG} @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${SECONDARY_MAX_LOAD} \ diff --git a/sys/arch/alpha/stand/bootxx/Makefile b/sys/arch/alpha/stand/bootxx/Makefile index 7e47ffeffd92..2c0c556e16d8 100644 --- a/sys/arch/alpha/stand/bootxx/Makefile +++ b/sys/arch/alpha/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/09/26 05:13:37 simonb Exp $ +# $NetBSD: Makefile,v 1.24 2001/09/22 03:34:18 tv Exp $ PROG = bootxx.old @@ -13,7 +13,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}.trunc ${PROG}: ${PROG}.sym @echo creating ${PROG} from ${PROG}.sym... - @objcopy --output-target=binary ${PROG}.sym ${PROG}.trunc + @${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG}.trunc @chmod 644 ${PROG}.trunc @dd if=${PROG}.trunc of=${PROG} obs=`expr 15 \* 512` conv=osync @ls -l ${PROG} diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile index fa3561478704..aabbeaec4130 100644 --- a/sys/arch/alpha/stand/netboot/Makefile +++ b/sys/arch/alpha/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/05/28 18:21:12 he Exp $ +# $NetBSD: Makefile,v 1.24 2001/09/22 03:34:18 tv Exp $ PROG = netboot @@ -16,7 +16,7 @@ CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPORT_DHCP \ ${PROG}: ${PROG}.sym @echo creating ${PROG} from ${PROG}.sym... - @objcopy --output-target=binary ${PROG}.sym ${PROG} + @${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG} @chmod 644 ${PROG} @ls -l ${PROG} @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${UNIFIED_MAX_LOAD} \ diff --git a/sys/arch/alpha/stand/ustarboot/Makefile b/sys/arch/alpha/stand/ustarboot/Makefile index e8d7cfd9c54b..07d5e40777fc 100644 --- a/sys/arch/alpha/stand/ustarboot/Makefile +++ b/sys/arch/alpha/stand/ustarboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/21 21:25:19 jdolecek Exp $ +# $NetBSD: Makefile,v 1.6 2001/09/22 03:34:18 tv Exp $ PROG = ustarboot @@ -17,7 +17,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}: ${PROG}.sym @echo creating ${PROG} from ${PROG}.sym... - @objcopy --output-target=binary ${PROG}.sym ${PROG} + @${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG} @chmod 644 ${PROG} @ls -l ${PROG} @${CHECKSIZE_CMD} ${PROG}.sym ${PROG} ${UNIFIED_MAX_LOAD} \ diff --git a/sys/arch/arm26/stand/Makefile.buildboot b/sys/arch/arm26/stand/Makefile.buildboot index 6328c066a789..799af08cbd5b 100644 --- a/sys/arch/arm26/stand/Makefile.buildboot +++ b/sys/arch/arm26/stand/Makefile.buildboot @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.buildboot,v 1.4 2001/08/02 23:38:04 bjh21 Exp $ +# $NetBSD: Makefile.buildboot,v 1.5 2001/09/22 03:34:18 tv Exp $ S?= ${.CURDIR}/../../../.. @@ -47,7 +47,6 @@ RISCOS_AS= library LIBRISCOS= ${RISCOSLIB} RELOC=8000 -OBJCOPY?=objcopy # -N (OMAGIC) since we don't need a gap between text and data. LINKFLAGS=-N diff --git a/sys/arch/atari/stand/bootxx/Makefile b/sys/arch/atari/stand/bootxx/Makefile index cc958a1c59c7..4f96feecb7b4 100644 --- a/sys/arch/atari/stand/bootxx/Makefile +++ b/sys/arch/atari/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/09/08 16:57:09 thomas Exp $ +# $NetBSD: Makefile,v 1.9 2001/09/22 03:34:18 tv Exp $ # for OBJECT_FMT .include @@ -50,7 +50,7 @@ beforeinstall: size ${PROG}; \ false; \ fi; \ - objcopy -O binary ${PROG} ${PROG}XX + ${OBJCOPY} -O binary ${PROG} ${PROG}XX @cat ${PROG}XX /dev/zero | dd of=${PROG}X \ bs=1 count=6656 2>/dev/null @mv -f ${PROG} ${PROG}XX diff --git a/sys/arch/atari/stand/xxboot/Makefile.inc b/sys/arch/atari/stand/xxboot/Makefile.inc index 4514757dc4b7..b92a33021a8c 100644 --- a/sys/arch/atari/stand/xxboot/Makefile.inc +++ b/sys/arch/atari/stand/xxboot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2001/09/05 19:48:12 thomas Exp $ +# $NetBSD: Makefile.inc,v 1.5 2001/09/22 03:34:19 tv Exp $ BINDIR= /usr/mdec BINMODE= ${NONBINMODE} @@ -8,7 +8,7 @@ LDFLAGS= -nostdlib -static -Wl,-x,-Ttext,0,-N CPPFLAGS+= -I- -I. -I.. beforeinstall: - objcopy -O binary ${PROG} ${PROG}X + ${OBJCOPY} -O binary ${PROG} ${PROG}X @mv -f ${PROG} ${PROG}XX @mv -f ${PROG}X ${PROG} diff --git a/sys/arch/i386/bioscall/Makefile b/sys/arch/i386/bioscall/Makefile index 807199e4337e..cccf31d1c152 100644 --- a/sys/arch/i386/bioscall/Makefile +++ b/sys/arch/i386/bioscall/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/02/01 05:25:31 tsutsui Exp $ +# $NetBSD: Makefile,v 1.11 2001/09/22 03:34:19 tv Exp $ CPPFLAGS= ${APMCPPFLAGS} KSRC=${.CURDIR}/../../.. @@ -21,7 +21,7 @@ biostramp.inc: biostramp.bin Makefile .if ${OBJECT_FMT} == "ELF" biostramp.bin: biostramp.obj - objcopy --output-target=binary $? $@ + ${OBJCOPY} --output-target=binary $? $@ .else biostramp.bin: biostramp.obj cp $? $@ diff --git a/sys/arch/i386/stand/Makefile.booters b/sys/arch/i386/stand/Makefile.booters index 7dcf0e40e238..2258748e46ee 100644 --- a/sys/arch/i386/stand/Makefile.booters +++ b/sys/arch/i386/stand/Makefile.booters @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.booters,v 1.27 2001/08/18 12:53:58 enami Exp $ +# $NetBSD: Makefile.booters,v 1.28 2001/09/22 03:34:19 tv Exp $ BINDIR= /usr/mdec STRIPFLAG= @@ -78,7 +78,7 @@ ${BASE}.sym: ${BSSTART} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${BASE}.rom: ${GENPROM} ${ROMSTART} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${LD} -o ${BASE}.sym ${LDFLAGS} -Ttext ${RELOC} ${ROMSTART} ${OBJS} \ ${LIBLIST} >${BASE}.list - objcopy --output-target=binary ${BASE}.sym ${BASE}.bin + ${OBJCOPY} --output-target=binary ${BASE}.sym ${BASE}.bin (cd ${GENPROMDIR}; ${MAKE} rom BINFILE=${.OBJDIR:Q}/${BASE:Q}.bin \ ROMFILE=${.OBJDIR:Q}/${BASE:Q}.rom ROM_SIZE=${ROM_SIZE:Q}) rm -f ${BASE}.bin @@ -86,6 +86,6 @@ ${BASE}.rom: ${GENPROM} ${ROMSTART} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI38 ${BASE}.com: ${DOSSTART} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${LD} -o ${BASE}.sym ${LDFLAGS} -Ttext 0x100 ${DOSSTART} ${OBJS} \ ${LIBLIST} >${BASE}.list - objcopy --output-target=binary ${BASE}.sym ${BASE}.com + ${OBJCOPY} --output-target=binary ${BASE}.sym ${BASE}.com .include diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile index 8d7ec918111c..75bc400376bc 100644 --- a/sys/arch/macppc/stand/ofwboot/Makefile +++ b/sys/arch/macppc/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/07/18 05:37:55 matt Exp $ +# $NetBSD: Makefile,v 1.22 2001/09/22 03:34:19 tv Exp $ S= ${.CURDIR}/../../../.. @@ -18,7 +18,6 @@ SRCS+= ofwmagic.S MKMAN= no STRIPFLAG= BINMODE= 444 -OBJCOPY?= objcopy .if !defined(FIXCOFF) .ifnmake(print-objdir) diff --git a/sys/arch/mipsco/stand/Makefile.booters b/sys/arch/mipsco/stand/Makefile.booters index 9f6f3aa5c565..bc364348c8af 100644 --- a/sys/arch/mipsco/stand/Makefile.booters +++ b/sys/arch/mipsco/stand/Makefile.booters @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.booters,v 1.2 2000/09/26 09:11:04 wdk Exp $ +# $NetBSD: Makefile.booters,v 1.3 2001/09/22 03:34:20 tv Exp $ S= ${.CURDIR}/../../../.. MIPS= ${S}/arch/mips @@ -114,7 +114,7 @@ ${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS} @${SIZE} ${PROG} .if defined(PRIMARY_PROG) @mv ${PROG} ${PROG}.elf - @objcopy --strip-all -O ecoff-bigmips -R .reginfo ${PROG}.elf ${PROG} + @${OBJCOPY} --strip-all -O ecoff-bigmips -R .reginfo ${PROG}.elf ${PROG} .endif .if defined(CHECKSIZE_CMD) @${CHECKSIZE_CMD} ${PROG} ${PRIMARY_MAX_LOAD} || \ diff --git a/sys/arch/news68k/stand/boot/Makefile b/sys/arch/news68k/stand/boot/Makefile index 54aa5c079f34..bbc1b13ef8fd 100644 --- a/sys/arch/news68k/stand/boot/Makefile +++ b/sys/arch/news68k/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/03/04 16:15:50 tsutsui Exp $ +# $NetBSD: Makefile,v 1.11 2001/09/22 03:34:20 tv Exp $ .include @@ -16,7 +16,6 @@ BINMODE= 444 SIZE?= size STRIP?= strip -OBJCOPY?= objcopy S= ${.CURDIR}/../../../.. diff --git a/sys/arch/newsmips/stand/boot/Makefile b/sys/arch/newsmips/stand/boot/Makefile index 6840a924c016..817efcc3dc48 100644 --- a/sys/arch/newsmips/stand/boot/Makefile +++ b/sys/arch/newsmips/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/02/01 05:25:43 tsutsui Exp $ +# $NetBSD: Makefile,v 1.9 2001/09/22 03:34:20 tv Exp $ S= ${.CURDIR}/../../../.. @@ -8,7 +8,6 @@ MKMAN= no STRIPFLAG= BINMODE= 444 -OBJCOPY?= objcopy SIZE?= size STRIP?= strip diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile index f99023d62f88..e1ee31ca4df0 100644 --- a/sys/arch/sparc/stand/boot/Makefile +++ b/sys/arch/sparc/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/09/22 00:56:23 mrg Exp $ +# $NetBSD: Makefile,v 1.26 2001/09/22 03:34:20 tv Exp $ STRIPFLAG= PROGSOURCE= boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \ @@ -23,8 +23,6 @@ AFLAGS+= -Wa,-32 OBJS=${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g} -OBJCOPY?= objcopy - LINKFLAGS=-N -e start .MAIN: all diff --git a/sys/arch/sparc/stand/ofwboot/Makefile b/sys/arch/sparc/stand/ofwboot/Makefile index fbd11727b3e2..f5bde05743c7 100644 --- a/sys/arch/sparc/stand/ofwboot/Makefile +++ b/sys/arch/sparc/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2001/09/22 03:34:20 tv Exp $ CURDIR= ${.CURDIR} S= ${CURDIR}/../../../.. @@ -21,7 +21,6 @@ CPPFLAGS+= -D_STANDALONE -DSUN4U MKMAN= no STRIPFLAG= BINMODE= 444 -OBJCOPY?= objcopy NEWVERSWHAT= "OpenFirmware Boot" diff --git a/sys/arch/x68k/stand/mboot/Makefile b/sys/arch/x68k/stand/mboot/Makefile index 7dc4a291d092..69832a921c72 100644 --- a/sys/arch/x68k/stand/mboot/Makefile +++ b/sys/arch/x68k/stand/mboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/12 16:57:28 minoura Exp $ +# $NetBSD: Makefile,v 1.8 2001/09/22 03:34:21 tv Exp $ BOOT= mboot VERSION= 0.1 @@ -14,7 +14,6 @@ MKMAN= no STRIPFLAG= STRIP?= /usr/bin/strip -OBJCOPY?= /usr/bin/objcopy SRCS= srt0.S mboot.c KERN!= cd ${.CURDIR}/../../../..; pwd diff --git a/sys/arch/x68k/stand/xxboot/Makefile b/sys/arch/x68k/stand/xxboot/Makefile index ff1e7e24dab0..ebca81e71127 100644 --- a/sys/arch/x68k/stand/xxboot/Makefile +++ b/sys/arch/x68k/stand/xxboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/12 16:57:28 minoura Exp $ +# $NetBSD: Makefile,v 1.9 2001/09/22 03:34:21 tv Exp $ BOOT= xxboot VERSION=0.3 @@ -18,7 +18,6 @@ SCRIPTS= installboot.sh MKMAN= no STRIP?= strip -OBJCOPY?= objcopy SRCS= xxboot.S bootufs.c unzip.c .PATH: ${.CURDIR}/gunzip diff --git a/sys/arch/x68k/usr.bin/loadkmap/Makefile b/sys/arch/x68k/usr.bin/loadkmap/Makefile index 14b7a7e1a340..5043c8f9201d 100644 --- a/sys/arch/x68k/usr.bin/loadkmap/Makefile +++ b/sys/arch/x68k/usr.bin/loadkmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/11/25 05:27:19 minoura Exp $ +# $NetBSD: Makefile,v 1.8 2001/09/22 03:34:21 tv Exp $ # Makefile for loadkmap PROG= loadkmap @@ -10,8 +10,6 @@ CLEANFILES+= ascii_kmap jis_kmap realall: loadkmap ascii_kmap jis_kmap -OBJCOPY?= /usr/bin/objcopy - ascii_kmap: ascii_kmap.c $(CC) -c -o ${.TARGET}.aout ${.CURDIR}/ascii_kmap.c ${OBJCOPY} -O binary ${.TARGET}.aout ${.TARGET}