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...
This commit is contained in:
sos 1998-05-25 17:34:42 +00:00
parent 872aa46baf
commit ea8b97a093
11 changed files with 22 additions and 15 deletions

View File

@ -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; \

View File

@ -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

View File

@ -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 \

View File

@ -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) \

View File

@ -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 \

View File

@ -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

View File

@ -1,5 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= nm
BINDIR= /usr/libexec/aout
.include <bsd.prog.mk>

View File

@ -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

View File

@ -1,5 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= size
BINDIR= /usr/libexec/aout
.include <bsd.prog.mk>

View File

@ -1,5 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= strings
BINDIR= /usr/libexec/aout
.include <bsd.prog.mk>

View File

@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= strip
BINDIR= /usr/libexec/aout
MAN1= strip.1
CLEANFILES += maybe_stripped