From a51c9b66271f0551fb83b90a7db6c464eac2318b Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 17 Sep 2002 01:49:00 +0000 Subject: Initiate deorbit burn for the i386-only a.out related support. Moves are under way to move the remnants of the a.out toolchain to ports. As the comment in src/Makefile said, this stuff is deprecated and one should not expect this to remain beyond 4.0-REL. It has already lasted WAY beyond that. Notable exceptions: gcc - I have not touched the a.out generation stuff there. ldd/ldconfig - still have some code to interface with a.out rtld. old as/ld/etc - I have not removed these yet, pending their move to ports. some includes - necessary for ldd/ldconfig for now. Tested on: i386 (extensively), alpha --- Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e99c0f0..6c08c5e 100644 --- a/Makefile +++ b/Makefile @@ -56,13 +56,6 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will -# update the legacy support for aout. This includes all libraries, ld.so -# and boot objects. This part of build should be regarded as -# deprecated and you should _not_ expect to be able to do this past the -# release of 4.0. You have exactly one major release to move entirely -# to elf. -# # If TARGET_ARCH=arch (e.g. ia64, sparc64, ...) is specified you can # cross build world for other architectures using the buildworld target, # and once the world is built you can cross build a kernel using the @@ -87,9 +80,6 @@ # upgrade. Optionally, you can also start it with NOCONFIRM=yes and skip # the confirmation steps. # -# At the end of the upgrade procedure, /etc/objformat is created or -# updated to contain OBJFORMAT=elf. From then on, you're elf by default. -# # ---------------------------------------------------------------------------- # # @@ -132,7 +122,7 @@ STARTTIME!= LC_ALL=C date # world: upgrade_checks @echo "--------------------------------------------------------------" - @echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}" + @echo ">>> elf make world started on ${STARTTIME}" @echo "--------------------------------------------------------------" .if target(pre-world) @echo @@ -152,7 +142,7 @@ world: upgrade_checks .endif @echo @echo "--------------------------------------------------------------" - @printf ">>> ${OBJFORMAT} make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @printf ">>> elf make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" @echo "--------------------------------------------------------------" # -- cgit v1.1