From 77dfb966d9bdfb8bf8442dc883287c347f74ccbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= Date: Mon, 25 May 1998 17:34:42 +0000 Subject: [PATCH] ELF preparation step 1: Move our old a.out utils to /usr/libexec/aout. Enable binutils and put the utils in /usr/libexec/elf Enable objformat, a little helper program that calls the right utils based on /etc/objformat and $OBJFORMAT. This will enable the ELF generating tools. Remember that this is only step one, the system is still compiled and run in a.out format ONLY. Problem left to solve: The BSD manpages wins over the GNU equivalents as the are installed last. We need to distinguish between the manpages somehow... --- Makefile | 6 +++++- gnu/usr.bin/Makefile | 11 +++-------- gnu/usr.bin/as/Makefile | 3 ++- gnu/usr.bin/ld/Makefile | 3 ++- usr.bin/Makefile | 8 ++++---- usr.bin/ar/Makefile | 1 + usr.bin/nm/Makefile | 1 + usr.bin/ranlib/Makefile | 1 + usr.bin/size/Makefile | 1 + usr.bin/strings/Makefile | 1 + usr.bin/strip/Makefile | 1 + 11 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e01708928144..9c44e891dbad 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.178 1998/05/16 22:20:44 jb Exp $ +# $Id: Makefile,v 1.179 1998/05/18 03:28:02 jb Exp $ # # While porting to the another architecture include the bootstrap instead # of the normal build. @@ -584,6 +584,10 @@ lib-tools: usr.bin/mk_cmds \ usr.bin/nm \ usr.bin/ranlib \ + usr.bin/strip \ + usr.bin/objformat \ + usr.bin/env \ + gnu/usr.bin/binutils \ usr.bin/uudecode cd ${.CURDIR}/$d; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ ${MAKE} ${MK_FLAGS} all; \ diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index d07b84e5c7cf..e3a97cbeadad 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,12 +1,7 @@ -# $Id: Makefile,v 1.40 1998/05/12 21:07:45 jb Exp $ +# $Id: Makefile,v 1.41 1998/05/12 23:09:36 jb Exp $ -SUBDIR= awk bc bison cc cpio cvs dc dialog diff diff3 genclass gperf \ - grep groff gzip man patch ptx rcs sdiff send-pr \ - sort tar texinfo - -.if ${BINFORMAT} == "elf" -SUBDIR+= binutils -.endif +SUBDIR= awk bc binutils bison cc cpio cvs dc dialog diff diff3 genclass gperf \ + grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if ${MACHINE_ARCH} == "i386" SUBDIR+=as gdb ld diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile index 4e25646d6374..a16c603994d3 100644 --- a/gnu/usr.bin/as/Makefile +++ b/gnu/usr.bin/as/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.1 (Berkeley) 3/3/91 -# $Id: Makefile,v 1.12 1997/02/22 15:43:22 peter Exp $ +# $Id: Makefile,v 1.13 1998/03/06 13:13:15 bde Exp $ .include "config/Makefile.$(MACHINE)" @@ -16,6 +16,7 @@ gas_objformat=aout ADDINCLUDE=-I${.OBJDIR} PROG= as +BINDIR= /usr/libexec/aout SRCS+= app.c as.c atof-generic.c bignum-copy.c \ cond.c expr.c flo-const.c flo-copy.c flonum-mult.c \ frags.c hash.c hex-value.c input-file.c input-scrub.c \ diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile index 1c60e2b0b540..a782641d62d1 100644 --- a/gnu/usr.bin/ld/Makefile +++ b/gnu/usr.bin/ld/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.21 1997/02/22 15:46:17 peter Exp $ +# $Id: Makefile,v 1.22 1997/06/29 21:36:33 bde Exp $ # PROG= ld +BINDIR= /usr/libexec/aout SRCS= ld.c symbol.c lib.c shlib.c warnings.c support.c rrs.c xbits.c md.c \ cplus-dem.c CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE) \ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 06ac4143feb6..a880524aab89 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $Id: Makefile,v 1.98 1998/04/14 07:40:47 peter Exp $ +# $Id: Makefile,v 1.99 1998/05/15 12:33:56 jb Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -16,9 +16,9 @@ SUBDIR= apply at banner basename biff c89 calendar \ join jot key keyinfo keyinit keylogin keylogout killall kzip \ lam last lastcomm leave lex limits locate lock lockf logger login \ logname look lsvfs m4 mail make mesg mkdep mkfifo mklocale mkstr \ - mktemp mk_cmds more msgs ncal newkey nice \ - nohup opieinfo opiekey opiepasswd pagesize passwd paste pr printenv \ - printf quota rdist renice rev rlogin rpcgen \ + mktemp mk_cmds more msgs ncal newkey nice nohup \ + objformat opieinfo opiekey opiepasswd pagesize passwd paste pr \ + printenv printf quota rdist renice rev rlogin rpcgen \ rpcinfo rs rsh rup ruptime rusers rwall \ rwho script sed shar showmount soelim split \ su symorder tail talk tconv tcopy tee tftp time \ diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 94bb84f9685d..04ae9223fc65 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= ar +BINDIR= /usr/libexec/aout CFLAGS+=-I${.CURDIR} SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \ move.c print.c replace.c diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile index 5266202b768d..20cd64ebaa95 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= nm +BINDIR= /usr/libexec/aout .include diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile index a6382a629d87..452c61de7235 100644 --- a/usr.bin/ranlib/Makefile +++ b/usr.bin/ranlib/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= ranlib +BINDIR= /usr/libexec/aout SRCS= archive.c build.c misc.c ranlib.c touch.c CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar MAN1= ranlib.1 diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile index 3ad91be22f8c..5c35df334125 100644 --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= size +BINDIR= /usr/libexec/aout .include diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile index 87f557ddbae4..7a848497a414 100644 --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= strings +BINDIR= /usr/libexec/aout .include diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile index 3d19864f4c22..99118925a911 100644 --- a/usr.bin/strip/Makefile +++ b/usr.bin/strip/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= strip +BINDIR= /usr/libexec/aout MAN1= strip.1 CLEANFILES += maybe_stripped