Index: Makefile =================================================================== RCS file: /home/ncvs/src/Makefile,v retrieving revision 1.264 diff -u -2 -r1.264 Makefile --- Makefile 2002/08/31 07:18:40 1.264 +++ Makefile 2002/09/16 02:07:12 @@ -57,11 +57,4 @@ # 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, @@ -88,7 +81,4 @@ # 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. -# # ---------------------------------------------------------------------------- # @@ -133,5 +123,5 @@ world: upgrade_checks @echo "--------------------------------------------------------------" - @echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}" + @echo ">>> elf make world started on ${STARTTIME}" @echo "--------------------------------------------------------------" .if target(pre-world) @@ -153,5 +143,5 @@ @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 "--------------------------------------------------------------" Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.303 diff -u -2 -r1.303 Makefile.inc1 --- Makefile.inc1 2002/08/23 12:49:16 1.303 +++ Makefile.inc1 2002/09/16 02:07:12 @@ -157,5 +157,4 @@ STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games TMPPATH= ${STRICTTMPPATH}:${PATH} -OBJFORMAT_PATH?= /usr/libexec INSTALLTMP!= /usr/bin/mktemp -d -u -t install @@ -187,5 +186,4 @@ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} \ - OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \ GROFF_BIN_PATH=${WORLDTMP}/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \ @@ -223,9 +221,8 @@ # kernel stage -KMAKEENV= ${WMAKEENV} \ - OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH} +KMAKEENV= ${WMAKEENV} USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \ - usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc \ + usr/libexec usr/sbin usr/share/misc \ usr/share/dict \ usr/share/groff_font/devX100 \ @@ -655,5 +652,5 @@ cross-tools: .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/binutils usr.sbin/crunch/crunchide \ gnu/usr.bin/cc ${_xlint} ${ECHODIR} "===> ${_tool}"; \ @@ -690,6 +687,6 @@ # _startup_libs= gnu/lib/csu gnu/lib/libgcc -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-${OBJFORMAT}) -_startup_libs+= lib/csu/${MACHINE_ARCH}-${OBJFORMAT} +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_ARCH}-elf .else _startup_libs+= lib/csu/${MACHINE_ARCH} Index: etc/Makefile =================================================================== RCS file: /home/ncvs/src/etc/Makefile,v retrieving revision 1.291 diff -u -2 -r1.291 Makefile --- etc/Makefile 2002/07/29 09:40:04 1.291 +++ etc/Makefile 2002/09/16 02:07:17 @@ -61,7 +61,4 @@ distribute: cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} -.if defined(OBJFORMAT) - echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/${DISTRIBUTION}/etc/objformat -.endif ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ Index: etc/rc =================================================================== RCS file: /home/ncvs/src/etc/rc,v retrieving revision 1.318 diff -u -2 -r1.318 rc --- etc/rc 2002/09/11 01:00:56 1.318 +++ etc/rc 2002/09/16 02:07:17 @@ -699,16 +699,12 @@ esac if [ -x /sbin/ldconfig ]; then - case `/usr/bin/objformat` in - elf) - _LDC=/usr/lib - for i in ${ldconfig_paths}; do - if [ -d "${i}" ]; then - _LDC="${_LDC} ${i}" - fi - done - echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} - ;; - esac + _LDC=/usr/lib + for i in ${ldconfig_paths}; do + if [ -d "${i}" ]; then + _LDC="${_LDC} ${i}" + fi + done + echo 'ELF ldconfig path:' ${_LDC} + ${ldconfig} ${_LDC} # Legacy aout support for i386 only Index: etc/mtree/BSD.usr.dist =================================================================== RCS file: /home/ncvs/src/etc/mtree/BSD.usr.dist,v retrieving revision 1.264 diff -u -2 -r1.264 BSD.usr.dist --- etc/mtree/BSD.usr.dist 2002/07/11 07:15:36 1.264 +++ etc/mtree/BSD.usr.dist 2002/09/16 02:07:17 @@ -39,8 +39,4 @@ .. libexec - aout - .. - elf - .. lpr ru Index: etc/rc.d/ldconfig =================================================================== RCS file: /home/ncvs/src/etc/rc.d/ldconfig,v retrieving revision 1.3 diff -u -2 -r1.3 ldconfig --- etc/rc.d/ldconfig 2002/09/06 16:18:05 1.3 +++ etc/rc.d/ldconfig 2002/09/16 02:07:18 @@ -24,16 +24,12 @@ checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i" if [ -x "${ldconfig_command}" ]; then - case `/usr/bin/objformat` in - elf) - _LDC=/usr/lib - for i in ${ldconfig_paths}; do - if [ -d "${i}" ]; then - _LDC="${_LDC} ${i}" - fi - done - echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} - ;; - esac + _LDC=/usr/lib + for i in ${ldconfig_paths}; do + if [ -d "${i}" ]; then + _LDC="${_LDC} ${i}" + fi + done + echo 'ELF ldconfig path:' ${_LDC} + ${ldconfig} -elf ${_LDC} # Legacy aout support for i386 only Index: gnu/lib/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/Makefile,v retrieving revision 1.38 diff -u -2 -r1.38 Makefile --- gnu/lib/Makefile 2002/05/29 00:45:50 1.38 +++ gnu/lib/Makefile 2002/09/16 02:07:18 @@ -3,10 +3,4 @@ SUBDIR= csu libgcc libdialog libregex libreadline -.if ${OBJFORMAT} == aout -.if !defined(NOLIBC_R) -SUBDIR+= libgcc_r -.endif -.endif - # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. Index: gnu/lib/libgcc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libgcc/Makefile,v retrieving revision 1.45 diff -u -2 -r1.45 Makefile --- gnu/lib/libgcc/Makefile 2002/05/18 09:46:12 1.45 +++ gnu/lib/libgcc/Makefile 2002/09/16 02:07:18 @@ -14,9 +14,4 @@ #SHLIB_MINOR= 0 -.if ${OBJFORMAT} == aout -# Install libgcc_pic.a, since ld.so uses it. -INSTALL_PIC_ARCHIVE= yes -.endif - # # XXX This is a hack, but it seems to work. @@ -38,7 +33,5 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ -DFINE_GRAINED_LIBRARIES -.if ${OBJFORMAT} != aout CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK -.endif CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. Index: gnu/usr.bin/binutils/Makefile.inc =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/binutils/Makefile.inc,v retrieving revision 1.5 diff -u -2 -r1.5 Makefile.inc --- gnu/usr.bin/binutils/Makefile.inc 2002/03/13 05:14:28 1.5 +++ gnu/usr.bin/binutils/Makefile.inc 2002/09/16 02:07:18 @@ -2,5 +2,5 @@ # $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc,v 1.5 2002/03/13 05:14:28 obrien Exp $ # +.include "../Makefile.inc" -BINDIR?= /usr/libexec/elf WARNS?= 3 Index: gnu/usr.bin/cc/c++filt/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/c++filt/Makefile,v retrieving revision 1.14 diff -u -2 -r1.14 Makefile --- gnu/usr.bin/cc/c++filt/Makefile 2002/05/17 06:35:44 1.14 +++ gnu/usr.bin/cc/c++filt/Makefile 2002/09/16 02:07:18 @@ -7,5 +7,4 @@ PROG= c++filt SRCS= cp-demangle.c cplus-dem+%DIKED.c -BINDIR= /usr/libexec/${OBJFORMAT} NOMAN= 1 Index: gnu/usr.bin/cc/cc_int/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc_int/Makefile,v retrieving revision 1.31 diff -u -2 -r1.31 Makefile --- gnu/usr.bin/cc/cc_int/Makefile 2002/05/13 11:24:01 1.31 +++ gnu/usr.bin/cc/cc_int/Makefile 2002/09/16 02:07:18 @@ -72,9 +72,5 @@ .endif -.if ${OBJFORMAT} == aout -UNDERSCORES= 1 -.else UNDERSCORES= 0 -.endif SRCS+= underscore.c CLEANFILES+= underscore.c Index: gnu/usr.bin/gzip/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/gzip/Makefile,v retrieving revision 1.23 diff -u -2 -r1.23 Makefile --- gnu/usr.bin/gzip/Makefile 2001/04/07 11:21:17 1.23 +++ gnu/usr.bin/gzip/Makefile 2002/09/16 02:07:19 @@ -32,5 +32,5 @@ match.o: ${.CURDIR}/match.S - $(CC) -E -traditional ${.CURDIR}/match.S >_match.s + $(CC) -E -DNO_UNDERLINE -traditional ${.CURDIR}/match.S >_match.s $(CC) -c _match.s mv -f _match.o match.o Index: gnu/usr.bin/gzip/match.S =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/gzip/match.S,v retrieving revision 1.8 diff -u -2 -r1.8 match.S --- gnu/usr.bin/gzip/match.S 2002/05/30 07:00:42 1.8 +++ gnu/usr.bin/gzip/match.S 2002/09/16 02:07:19 @@ -15,5 +15,5 @@ * external symbols with an underline character '_'. */ -#ifdef __ELF__ /* NO_UNDERLINE */ +#ifdef NO_UNDERLINE # define _prev prev # define _window window Index: include/link.h =================================================================== RCS file: /home/ncvs/src/include/link.h,v retrieving revision 1.24 diff -u -2 -r1.24 link.h --- include/link.h 2002/08/22 20:37:30 1.24 +++ include/link.h 2002/09/16 02:07:19 @@ -31,7 +31,3 @@ */ -#if (defined(FREEBSD_ELF) || defined(__ELF__)) && !defined(FREEBSD_AOUT) #include -#else -#include -#endif Index: lib/Makefile =================================================================== RCS file: /home/ncvs/src/lib/Makefile,v retrieving revision 1.141 diff -u -2 -r1.141 Makefile --- lib/Makefile 2002/08/02 07:09:53 1.141 +++ lib/Makefile 2002/09/16 02:07:19 @@ -33,6 +33,6 @@ libwrap libxpg4 liby libz -.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) -_csu=csu/${MACHINE_ARCH}-${OBJFORMAT} +.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) +_csu=csu/${MACHINE_ARCH}-elf .elif exists(${.CURDIR}/csu/${MACHINE_ARCH}/Makefile) _csu=csu/${MACHINE_ARCH} Index: lib/libc/gen/dlfcn.c =================================================================== RCS file: /home/ncvs/src/lib/libc/gen/dlfcn.c,v retrieving revision 1.8 diff -u -2 -r1.8 dlfcn.c --- lib/libc/gen/dlfcn.c 2002/09/11 05:05:48 1.8 +++ lib/libc/gen/dlfcn.c 2002/09/16 02:07:19 @@ -29,10 +29,6 @@ /* - * Linkage to services provided by the dynamic linker. These are - * implemented differently in ELF and a.out, because the dynamic - * linkers have different interfaces. + * Linkage to services provided by the dynamic linker. */ -#ifdef __ELF__ - #include #include @@ -108,75 +104,2 @@ return NULL; } - -#else /* a.out format */ - -#include -#include /* XXX - Required by link.h */ -#include -#include -#include - -/* - * For a.out, entry to the dynamic linker is via these trampolines. - * They enter the dynamic linker through the ld_entry struct that was - * passed back from the dynamic linker at startup time. - */ - -/* GCC is needed because we use its __builtin_return_address construct. */ - -#ifndef __GNUC__ -#error "GCC is needed to compile this file" -#endif - -/* - * These variables are set by code in crt0.o. For compatibility with - * old executables, they must be common, not extern. - */ -struct ld_entry *__ldso_entry; /* Entry points to dynamic linker */ -int __ldso_version; /* Dynamic linker version number */ - -int -dladdr(const void *addr, Dl_info *dlip) -{ - if (__ldso_entry == NULL || __ldso_version < LDSO_VERSION_HAS_DLADDR) - return 0; - return (__ldso_entry->dladdr)(addr, dlip); -} - -int -dlclose(void *handle) -{ - if (__ldso_entry == NULL) - return -1; - return (__ldso_entry->dlclose)(handle); -} - -const char * -dlerror(void) -{ - if (__ldso_entry == NULL) - return "Service unavailable"; - return (__ldso_entry->dlerror)(); -} - -void * -dlopen(const char *name, int mode) -{ - if (__ldso_entry == NULL) - return NULL; - return (__ldso_entry->dlopen)(name, mode); -} - -void * -dlsym(void * __restrict handle, const char * __restrict name) -{ - if (__ldso_entry == NULL) - return NULL; - if (__ldso_version >= LDSO_VERSION_HAS_DLSYM3) { - void *retaddr = __builtin_return_address(0); /* __GNUC__ only */ - return (__ldso_entry->dlsym3)(handle, name, retaddr); - } else - return (__ldso_entry->dlsym)(handle, name); -} - -#endif /* __ELF__ */ Index: lib/libc/gen/getobjformat.c =================================================================== RCS file: /home/ncvs/src/lib/libc/gen/getobjformat.c,v retrieving revision 1.6 diff -u -2 -r1.6 getobjformat.c --- lib/libc/gen/getobjformat.c 2002/04/09 11:39:03 1.6 +++ lib/libc/gen/getobjformat.c 2002/09/16 02:07:19 @@ -34,87 +34,11 @@ #include -#define PATH_OBJFORMAT "/etc/objformat" - -static int copyformat(char *, const char *, size_t); - -static const char *known_formats[] = { OBJFORMAT_NAMES, NULL }; - -static int -copyformat(char *buf, const char *fmt, size_t bufsize) -{ - size_t len; - - len = strlen(fmt); - if (len > bufsize - 1) - return -1; - strcpy(buf, fmt); - return len; -} - int getobjformat(char *buf, size_t bufsize, int *argcp, char **argv) { - const char *fmt; - char **src, **dst; - const char *env; - FILE *fp; - - fmt = NULL; - if (argv != NULL) { - /* - * Scan for arguments setting known formats, e.g., "-elf". - * If "argcp" is non-NULL, delete these arguments from the - * list and update the argument count in "*argcp". - */ - for (dst = src = argv; *src != NULL; src++) { - if ((*src)[0] == '-') { - const char **p; - - for (p = known_formats; *p != NULL; p++) - if (strcmp(*src + 1, *p) == 0) - break; - if (*p != NULL) { - fmt = *p; - if (argcp == NULL) /* Don't delete */ - *dst++ = *src; - } else - *dst++ = *src; - } else - *dst++ = *src; - } - *dst = NULL; - if (argcp != NULL) - *argcp -= src - dst; - if (fmt != NULL) - return copyformat(buf, fmt, bufsize); - } - - /* Check the OBJFORMAT environment variable. */ - if ((env = getenv("OBJFORMAT")) != NULL) - return copyformat(buf, env, bufsize); - - /* Take a look at "/etc/objformat". */ - if ((fp = fopen(PATH_OBJFORMAT, "r")) != NULL) { - char line[1024]; - int found; - int len; - - found = len = 0; - while (fgets(line, sizeof line, fp) != NULL) { - if (strncmp(line, "OBJFORMAT=", 10) == 0) { - char *p = &line[10]; - - p[strcspn(p, " \t\n")] = '\0'; - len = copyformat(buf, p, bufsize); - found = 1; - } - } - fclose(fp); - if (found) - return len; - } - - /* As a last resort, use the compiled in default. */ - return copyformat(buf, OBJFORMAT_DEFAULT, bufsize); + if (bufsize < 4) + return -1; + strcpy(buf, "elf"); + return 3; } Index: lib/libc/gmon/gmon.c =================================================================== RCS file: /home/ncvs/src/lib/libc/gmon/gmon.c,v retrieving revision 1.15 diff -u -2 -r1.15 gmon.c --- lib/libc/gmon/gmon.c 2002/05/30 07:00:42 1.15 +++ lib/libc/gmon/gmon.c 2002/09/16 02:07:19 @@ -54,5 +54,5 @@ #include "libc_private.h" -#if defined(__ELF__) && (defined(__i386__) || defined(__sparc64__)) +#if defined(__i386__) || defined(__sparc64__) extern char *minbrk asm (".minbrk"); #else Index: lib/libc/i386/SYS.h =================================================================== RCS file: /home/ncvs/src/lib/libc/i386/SYS.h,v retrieving revision 1.23 diff -u -2 -r1.23 SYS.h --- lib/libc/i386/SYS.h 2002/03/22 23:41:44 1.23 +++ lib/libc/i386/SYS.h 2002/09/16 02:07:19 @@ -59,7 +59,3 @@ #define LCALL(x,y) .byte 0x9a ; .long y; .word x -#ifdef __ELF__ -#define KERNCALL int $0x80 /* Faster */ -#else -#define KERNCALL LCALL(7,0) /* The old way */ -#endif +#define KERNCALL int $0x80 Index: lib/libmd/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libmd/Makefile,v retrieving revision 1.37 diff -u -2 -r1.37 Makefile --- lib/libmd/Makefile 2002/04/10 17:01:55 1.37 +++ lib/libmd/Makefile 2002/09/16 02:07:20 @@ -33,5 +33,4 @@ .PATH: ${.CURDIR}/${MACHINE_ARCH} -.if ${OBJFORMAT} == "elf" .if exists(${MACHINE_ARCH}/sha.S) SRCS+= sha.S @@ -41,5 +40,4 @@ SRCS+= rmd160.S CFLAGS+= -DRMD160_ASM -DELF -.endif .endif Index: lib/libncurses/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libncurses/Makefile,v retrieving revision 1.58 diff -u -2 -r1.58 Makefile --- lib/libncurses/Makefile 2002/08/21 16:19:57 1.58 +++ lib/libncurses/Makefile 2002/09/16 02:07:20 @@ -234,16 +234,4 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a .if !defined(NOPIC) -.if ${OBJFORMAT} == aout -SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libcurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libtermlib.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libmytinfo.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -SYMLINKS+=libncurses.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - libtinfo.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -.else # no need for major at all, it's an ld-time redirection only SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so @@ -252,5 +240,4 @@ SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so -.endif .endif .if !defined(NOPROFILE) Index: lib/libpam/libpam/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpam/libpam/Makefile,v retrieving revision 1.40 diff -u -2 -r1.40 Makefile --- lib/libpam/libpam/Makefile 2002/07/23 17:59:46 1.40 +++ lib/libpam/libpam/Makefile 2002/09/16 02:07:20 @@ -154,9 +154,5 @@ openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} -.if ${OBJFORMAT} == elf ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} -.else - ${LD} -o ${.TARGET} -r -Bforcearchive ${.ALLSRC} -.endif # Headers Index: lib/liby/Makefile =================================================================== RCS file: /home/ncvs/src/lib/liby/Makefile,v retrieving revision 1.8 diff -u -2 -r1.8 Makefile --- lib/liby/Makefile 2001/11/03 06:24:23 1.8 +++ lib/liby/Makefile 2002/09/16 02:07:20 @@ -7,30 +7,5 @@ SRCS= main.c yyerror.c -.if ${OBJFORMAT} != aout NOPIC= true -.endif -# -# Before complaining about this, please *double-check* that you have -# updated the ldconfig path in /etc/rc to include /usr/lib/compat that -# was added in src/etc/rc rev 1.98. -# This is so that `ld' will not continue to generate binaries linked -# shared against liby, so that in a future release we can move this -# off to a compat dist (like compat22). -# -beforeinstall: - -rm -f ${DESTDIR}/usr/lib/compat/lib${LIB}.so \ - ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR} - .include - -# This must follow the .include in case SHLIBDIR is defined there. -ORIG_SHLIBDIR:= ${SHLIBDIR} - -.if ${OBJFORMAT} == aout -# The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR}, -# so neither does this. -SHLIBDIR= /usr/lib/compat/aout -.endif Index: libexec/Makefile =================================================================== RCS file: /home/ncvs/src/libexec/Makefile,v retrieving revision 1.48 diff -u -2 -r1.48 Makefile --- libexec/Makefile 2002/08/13 14:03:40 1.48 +++ libexec/Makefile 2002/09/16 02:07:20 @@ -24,4 +24,5 @@ rpc.sprayd \ rshd \ + rtld-elf \ save-entropy \ talkd \ @@ -39,11 +40,4 @@ .endif -.if ${OBJFORMAT} == aout -SUBDIR+=rtld-aout -.endif - -.if ${OBJFORMAT} == elf -SUBDIR+=rtld-elf -.endif .if defined(RELEASEDIR) || \ Index: libexec/rtld-aout/shlib.c =================================================================== RCS file: /home/ncvs/src/libexec/rtld-aout/shlib.c,v retrieving revision 1.22 diff -u -2 -r1.22 shlib.c --- libexec/rtld-aout/shlib.c 1999/08/28 00:10:05 1.22 +++ libexec/rtld-aout/shlib.c 2002/09/16 02:07:20 @@ -45,5 +45,5 @@ #include -#include +#include #include "shlib.h" #include "support.h" Index: release/Makefile =================================================================== RCS file: /home/ncvs/src/release/Makefile,v retrieving revision 1.704 diff -u -2 -r1.704 Makefile --- release/Makefile 2002/09/10 13:06:53 1.704 +++ release/Makefile 2002/09/16 02:07:20 @@ -71,7 +71,4 @@ RELEASEPORTSMODULE?= ports -# Unless set elsewhere, indicate the object format we'll be using. -OBJFORMAT?= elf - # Uncomment this to disable the doc.1 target. Docs normally require # the ports tree, so NOPORTS can be set together with NODOC in order @@ -348,5 +345,4 @@ mv newvers.sh foo && \ sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh && rm foo ) - echo OBJFORMAT=${OBJFORMAT} > ${CHROOTDIR}/etc/objformat -test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release echo "#!/bin/sh" > ${CHROOTDIR}/mk @@ -358,5 +354,5 @@ EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \ MAKE_ISOS NODOC NOKERBEROS NOPORTS NOSHARED \ - NOSRC NO_SENDMAIL OBJFORMAT RELEASETAG \ + NOSRC NO_SENDMAIL RELEASETAG \ RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS .if defined(${var}) @@ -488,5 +484,5 @@ if [ -f ${.CURDIR}/scripts/$${i}-make.sh ]; then \ echo -n "Running $$i dist creation script... "; \ - env OBJFORMAT=${OBJFORMAT} RD=${RD} sh ${.CURDIR}/scripts/$${i}-make.sh || echo "$$i distribution script returned bad status."; \ + env RD=${RD} sh ${.CURDIR}/scripts/$${i}-make.sh || echo "$$i distribution script returned bad status."; \ echo "Done."; \ fi \ Index: sbin/ldconfig/ldconfig.c =================================================================== RCS file: /home/ncvs/src/sbin/ldconfig/ldconfig.c,v retrieving revision 1.37 diff -u -2 -r1.37 ldconfig.c --- sbin/ldconfig/ldconfig.c 2002/03/21 13:14:19 1.37 +++ sbin/ldconfig/ldconfig.c 2002/09/16 02:07:21 @@ -45,5 +45,5 @@ #include #include -#include +#include #include #include @@ -103,15 +103,16 @@ int i, c; int rval = 0; - char objformat[32]; int is_aout; - if (getobjformat(objformat, sizeof objformat, &argc, argv) == -1) - errx(1, "getobjformat failed: name too long"); - if (strcmp(objformat, "aout") == 0) + is_aout = 0; + if (argc > 1 && strcmp(argv[1], "-aout") == 0) { is_aout = 1; - else if (strcmp(objformat, "elf") == 0) - is_aout = 0; - else - errx(1, "unknown object format \"%s\"", objformat); + argc--; + argv++; + } else if (argc > 1 && strcmp(argv[1], "-elf") == 0) { + /* skip over legacy -elf arg */ + argc--; + argv++; + } hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; Index: share/mk/bsd.dep.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.dep.mk,v retrieving revision 1.36 diff -u -2 -r1.36 bsd.dep.mk --- share/mk/bsd.dep.mk 2002/07/03 12:44:06 1.36 +++ share/mk/bsd.dep.mk 2002/09/16 02:07:22 @@ -154,5 +154,4 @@ .if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) checkdpadd: -.if ${OBJFORMAT} != aout @ldadd=`echo \`for lib in ${DPADD} ; do \ echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ @@ -164,11 +163,3 @@ echo "LDADD -> $$ldadd1" ; \ fi -.else - @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ - if [ "$$dpadd" != "${DPADD}" ] ; then \ - echo ${.CURDIR} ; \ - echo "LDADD -> $$dpadd" ; \ - echo "DPADD = ${DPADD}" ; \ - fi -.endif .endif Index: share/mk/bsd.lib.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v retrieving revision 1.136 diff -u -2 -r1.136 bsd.lib.mk --- share/mk/bsd.lib.mk 2002/07/29 09:40:12 1.136 +++ share/mk/bsd.lib.mk 2002/09/16 02:07:22 @@ -13,5 +13,4 @@ .undef INSTALL_PIC_ARCHIVE .else -.if ${OBJFORMAT} == elf .if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} @@ -21,9 +20,4 @@ .endif SONAME?= ${SHLIB_NAME} -.else -.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) -SHLIB_NAME?= lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} -.endif -.endif .endif @@ -36,7 +30,5 @@ .endif -.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES) .include -.endif # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries @@ -198,14 +190,8 @@ @ln -fs ${.TARGET} ${SHLIB_LINK} .endif -.if ${OBJFORMAT} == aout - @${CC} -shared -Wl,-x,-assert,pure-text \ - -o ${.TARGET} \ - `lorder ${SOBJS} | tsort -q` ${LDADD} -.else @${CC} ${LDFLAGS} -shared -Wl,-x \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `lorder ${SOBJS} | tsort -q` ${LDADD} .endif -.endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) @@ -244,12 +230,6 @@ mv $$TMP ${DEPENDFILE} .if !defined(NOEXTRADEPEND) && defined(SHLIB_NAME) -.if ${OBJFORMAT} == aout - echo ${SHLIB_NAME}: \ - `${CC} -shared -Wl,-f ${LDADD}` \ - >> ${DEPENDFILE} -.else .if defined(DPADD) && !empty(DPADD) echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE} -.endif .endif .endif Index: share/mk/bsd.own.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.own.mk,v retrieving revision 1.36 diff -u -2 -r1.36 bsd.own.mk --- share/mk/bsd.own.mk 2002/07/29 09:40:12 1.36 +++ share/mk/bsd.own.mk 2002/09/16 02:07:22 @@ -22,7 +22,4 @@ # stripped/not-stripped using a single knob. [-s] # -# OBJFORMAT Default object format that selects which set of tools to run. -# [elf] -# # BINOWN Binary owner. [root] # @@ -124,9 +121,5 @@ KMODMODE?= ${BINMODE} -.if ${OBJFORMAT} == aout -LIBDIR?= /usr/lib/aout -.else LIBDIR?= /usr/lib -.endif LIBCOMPATDIR?= /usr/lib/compat LIBDATADIR?= /usr/libdata Index: share/mk/bsd.prog.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.prog.mk,v retrieving revision 1.126 diff -u -2 -r1.126 bsd.prog.mk --- share/mk/bsd.prog.mk 2002/07/29 09:40:12 1.126 +++ share/mk/bsd.prog.mk 2002/09/16 02:07:22 @@ -83,8 +83,4 @@ .if defined(PROG) _EXTRADEPEND: -.if ${OBJFORMAT} == aout - echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \ - ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE} -.else echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} .if defined(PROG_CXX) @@ -92,5 +88,4 @@ .endif .endif -.endif .if !target(install) @@ -187,7 +182,5 @@ .endif -.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES) .include -.endif .include Index: share/mk/sys.mk =================================================================== RCS file: /home/ncvs/src/share/mk/sys.mk,v retrieving revision 1.62 diff -u -2 -r1.62 sys.mk --- share/mk/sys.mk 2002/04/22 08:56:34 1.62 +++ share/mk/sys.mk 2002/09/16 02:07:22 @@ -260,13 +260,5 @@ .endif -# -# The build tools are indirected by /usr/bin/objformat which determines the -# object format from the OBJFORMAT environment variable and if this is not -# defined, it reads /etc/objformat. -# -.if exists(/etc/objformat) && !defined(OBJFORMAT) -.include "/etc/objformat" -.endif - # Default executable format +# XXX hint for bsd.port.mk OBJFORMAT?= elf Index: sys/alpha/include/asm.h =================================================================== RCS file: /home/ncvs/src/sys/alpha/include/asm.h,v retrieving revision 1.13 diff -u -2 -r1.13 asm.h --- sys/alpha/include/asm.h 2002/03/23 02:01:27 1.13 +++ sys/alpha/include/asm.h 2002/09/16 02:07:22 @@ -620,9 +620,7 @@ * WEAK_ALIAS: create a weak alias (ELF only). */ -#ifdef __ELF__ #define WEAK_ALIAS(alias,sym) \ .weak alias; \ alias = sym -#endif /* @@ -632,17 +630,7 @@ #ifdef _KERNEL -#ifdef __ELF__ -#define __KERNEL_SECTIONSTRING(_sec, _str) \ - .section _sec ; .asciz _str ; .text -#else /* __ELF__ */ -#define __KERNEL_SECTIONSTRING(_sec, _str) \ - .data ; .asciz _str ; .align 3 ; .text -#endif /* __ELF__ */ - -#define __KERNEL_RCSID(_n, _s) __KERNEL_SECTIONSTRING(.ident, _s) -#define __KERNEL_COPYRIGHT(_n, _s) __KERNEL_SECTIONSTRING(.copyright, _s) - -#ifdef NO_KERNEL_RCSIDS -#undef __KERNEL_RCSID +#if !defined(lint) && !defined(NO_KERNEL_RCSIDS) +#define __KERNEL_RCSID(_n, _s) .ident _s +#else #define __KERNEL_RCSID(_n, _s) /* nothing */ #endif Index: sys/alpha/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/alpha/include/param.h,v retrieving revision 1.28 diff -u -2 -r1.28 param.h --- sys/alpha/include/param.h 2002/05/14 20:35:25 1.28 +++ sys/alpha/include/param.h 2002/09/16 02:07:22 @@ -92,11 +92,4 @@ #include -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 32 Index: sys/arm/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/arm/include/param.h,v retrieving revision 1.3 diff -u -2 -r1.3 param.h --- sys/arm/include/param.h 2002/05/14 20:35:27 1.3 +++ sys/arm/include/param.h 2002/09/16 02:07:22 @@ -77,11 +77,4 @@ #include -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 2 Index: sys/boot/i386/boot0/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/boot0/Makefile,v retrieving revision 1.16 diff -u -2 -r1.16 Makefile --- sys/boot/i386/boot0/Makefile 2002/01/10 21:40:33 1.16 +++ sys/boot/i386/boot0/Makefile 2002/09/16 02:07:22 @@ -25,11 +25,6 @@ boot0: boot0.o -.if ${OBJFORMAT} == aout - ${LD} -N -s -T ${BOOT_BOOT0_ORG} -o boot0.out boot0.o - dd if=boot0.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${BOOT_BOOT0_ORG} -o boot0.out boot0.o objcopy -S -O binary boot0.out ${.TARGET} -.endif boot0.o: boot0.s Index: sys/boot/i386/btx/btx/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/btx/btx/Makefile,v retrieving revision 1.12 diff -u -2 -r1.12 Makefile --- sys/boot/i386/btx/btx/Makefile 2001/11/03 22:09:30 1.12 +++ sys/boot/i386/btx/btx/Makefile 2002/09/16 02:07:22 @@ -29,11 +29,6 @@ btx: btx.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o btx.out btx.o - dd if=btx.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o btx.out btx.o objcopy -S -O binary btx.out ${.TARGET} -.endif btx.o: btx.s Index: sys/boot/i386/btx/btxldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/btx/btxldr/Makefile,v retrieving revision 1.10 diff -u -2 -r1.10 Makefile --- sys/boot/i386/btx/btxldr/Makefile 2001/07/21 14:32:44 1.10 +++ sys/boot/i386/btx/btxldr/Makefile 2002/09/16 02:07:22 @@ -11,11 +11,6 @@ btxldr: btxldr.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${LOADER_ADDRESS} -o btxldr.out btxldr.o - dd if=btxldr.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${LOADER_ADDRESS} -o btxldr.out btxldr.o objcopy -S -O binary btxldr.out ${.TARGET} -.endif btxldr.o: btxldr.s Index: sys/boot/i386/btx/lib/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/btx/lib/Makefile,v retrieving revision 1.9 diff -u -2 -r1.9 Makefile --- sys/boot/i386/btx/lib/Makefile 2002/05/13 15:48:05 1.9 +++ sys/boot/i386/btx/lib/Makefile 2002/09/16 02:07:22 @@ -2,6 +2,4 @@ OBJS= btxcsu.o btxsys.o btxv86.o -AFLAGS+= -elf -LDFLAGS+= -elf CLEANFILES+= crt0.o ${OBJS} Index: sys/boot/i386/cdboot/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/cdboot/Makefile,v retrieving revision 1.4 diff -u -2 -r1.4 Makefile --- sys/boot/i386/cdboot/Makefile 2001/11/04 03:24:16 1.4 +++ sys/boot/i386/cdboot/Makefile 2002/09/16 02:07:22 @@ -11,11 +11,6 @@ ${PROG}: ${PROG}.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o ${PROG}.out ${PROG}.o - dd if=${PROG}.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o ${PROG}.out ${PROG}.o objcopy -S -O binary ${PROG}.out ${.TARGET} -.endif CLEANFILES+= ${PROG}.o ${PROG}.out Index: sys/boot/i386/kgzldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/kgzldr/Makefile,v retrieving revision 1.10 diff -u -2 -r1.10 Makefile --- sys/boot/i386/kgzldr/Makefile 2002/05/10 01:06:52 1.10 +++ sys/boot/i386/kgzldr/Makefile 2002/09/16 02:07:22 @@ -5,9 +5,5 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding -.if ${OBJFORMAT} == aout -CFLAGS+=-O2 -.else CFLAGS+=-Os -.endif CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r @@ -17,7 +13,4 @@ CLEANFILES=${FILES} -M4?= m4 -M4FLAGS=-DOBJFORMAT=${OBJFORMAT} - BOOT_COMCONSOLE_PORT?= 0x3f8 M4FLAGS+=-DSIOPRT=${BOOT_COMCONSOLE_PORT} @@ -25,8 +18,4 @@ kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} - -.s.o: - (cd ${.CURDIR}; ${M4} ${M4FLAGS} kgzldr.m4 ${.IMPSRC}) |\ - ${AS} ${AFLAGS} -o ${.TARGET} .include Index: sys/boot/i386/kgzldr/crt.s =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/kgzldr/crt.s,v retrieving revision 1.3 diff -u -2 -r1.3 crt.s --- sys/boot/i386/kgzldr/crt.s 2000/11/04 13:03:52 1.3 +++ sys/boot/i386/kgzldr/crt.s 2002/09/16 02:07:23 @@ -39,9 +39,9 @@ .set BDA_POS,0x450 # Cursor position - .globl _(crt_putchr) + .globl crt_putchr # void crt_putchr(int c) -_(crt_putchr): movb 0x4(%esp,1),%al # Get character +crt_putchr: movb 0x4(%esp,1),%al # Get character pusha # Save xorl %ecx,%ecx # Zero for loops Index: sys/boot/i386/kgzldr/kgzldr.m4 =================================================================== RCS file: kgzldr.m4 diff -N kgzldr.m4 --- /tmp/cvstmp/cvs1kg6NFzsWY Sun Sep 15 19:10:54 2002 +++ /dev/null Sun Sep 15 19:02:15 2002 @@ -1,18 +0,0 @@ -# -# Copyright (c) 2000 Robert Nordier -# All rights reserved. -# -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. -# -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. -# - -# $FreeBSD: src/sys/boot/i386/kgzldr/kgzldr.m4,v 1.1 2000/11/04 13:03:52 rnordier Exp $ - -define(_,`ifelse(OBJFORMAT,`aout',`_$1',`$1')') Index: sys/boot/i386/kgzldr/sio.s =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/kgzldr/sio.s,v retrieving revision 1.3 diff -u -2 -r1.3 sio.s --- sys/boot/i386/kgzldr/sio.s 2000/11/04 13:03:52 1.3 +++ sys/boot/i386/kgzldr/sio.s 2002/09/16 02:07:23 @@ -30,9 +30,9 @@ .set SIO_PRT,SIOPRT # Base port - .globl _(sio_putchr) + .globl sio_putchr # void sio_putchr(int c) -_(sio_putchr): movw $SIO_PRT+0x5,%dx # Line status reg +sio_putchr: movw $SIO_PRT+0x5,%dx # Line status reg xor %ecx,%ecx # Timeout movb $0x40,%ch # counter Index: sys/boot/i386/kgzldr/start.s =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/kgzldr/start.s,v retrieving revision 1.3 diff -u -2 -r1.3 start.s --- sys/boot/i386/kgzldr/start.s 2000/11/04 13:03:52 1.3 +++ sys/boot/i386/kgzldr/start.s 2002/09/16 02:07:23 @@ -41,5 +41,5 @@ stosb # bss pushl 0x4(%esp) # Pass howto flags - call _(boot) # Call C code + call boot # Call C code popl %ecx # Clear stack - jmp *_(kgz)+entry # To loaded code + jmp *kgz+entry # To loaded code Index: sys/boot/i386/liloldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/liloldr/Makefile,v retrieving revision 1.3 diff -u -2 -r1.3 Makefile --- sys/boot/i386/liloldr/Makefile 2000/09/05 22:33:07 1.3 +++ sys/boot/i386/liloldr/Makefile 2002/09/16 02:07:23 @@ -28,21 +28,10 @@ ${LDR}: ${LDR}.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o ${LDR}.out ${LDR}.o - dd if=${LDR}.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o objcopy -S -O binary ${LDR}.out ${.TARGET} -.endif ${BSECT}: ${BSECT}.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o ${BSECT}.out ${BSECT}.o - dd if=${BSECT}.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o ${BSECT}.out ${BSECT}.o objcopy -S -O binary ${BSECT}.out ${.TARGET} -.endif - ${BSECT}.o: ${BSECT}.s ${LOADER} Index: sys/boot/i386/mbr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/mbr/Makefile,v retrieving revision 1.5 diff -u -2 -r1.5 Makefile --- sys/boot/i386/mbr/Makefile 2001/07/21 14:32:45 1.5 +++ sys/boot/i386/mbr/Makefile 2002/09/16 02:07:23 @@ -10,11 +10,6 @@ mbr: mbr.o -.if ${OBJFORMAT} == aout - ${LD} -N -s -T ${ORG} -o mbr.out mbr.o - dd if=mbr.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o mbr.out mbr.o objcopy -S -O binary mbr.out ${.TARGET} -.endif CLEANFILES+= mbr.out mbr.o Index: sys/boot/i386/pxeldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/i386/pxeldr/Makefile,v retrieving revision 1.7 diff -u -2 -r1.7 Makefile --- sys/boot/i386/pxeldr/Makefile 2002/08/29 23:37:44 1.7 +++ sys/boot/i386/pxeldr/Makefile 2002/09/16 02:07:23 @@ -44,11 +44,6 @@ ${LDR}: ${LDR}.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o ${LDR}.out ${LDR}.o - dd if=${LDR}.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o ${LDR}.out ${LDR}.o objcopy -S -O binary ${LDR}.out ${.TARGET} -.endif ${LDR}.o: ${LDR}.s Index: sys/boot/pc98/btx/btx/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/pc98/btx/btx/Makefile,v retrieving revision 1.6 diff -u -2 -r1.6 Makefile --- sys/boot/pc98/btx/btx/Makefile 2001/11/17 13:57:32 1.6 +++ sys/boot/pc98/btx/btx/Makefile 2002/09/16 02:07:23 @@ -30,11 +30,6 @@ btx: btx.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${ORG} -o btx.out btx.o - dd if=btx.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${ORG} -o btx.out btx.o objcopy -S -O binary btx.out ${.TARGET} -.endif btx.o: btx.s Index: sys/boot/pc98/btx/btxldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/pc98/btx/btxldr/Makefile,v retrieving revision 1.3 diff -u -2 -r1.3 Makefile --- sys/boot/pc98/btx/btxldr/Makefile 2000/03/31 16:02:58 1.3 +++ sys/boot/pc98/btx/btxldr/Makefile 2002/09/16 02:07:23 @@ -11,11 +11,6 @@ btxldr: btxldr.o -.if ${OBJFORMAT} == aout - ${LD} -nostdlib -N -s -T ${LOADER_ADDRESS} -o btxldr.out btxldr.o - dd if=btxldr.out of=${.TARGET} ibs=32 skip=1 -.else ${LD} -N -e start -Ttext ${LOADER_ADDRESS} -o btxldr.out btxldr.o objcopy -S -O binary btxldr.out ${.TARGET} -.endif btxldr.o: btxldr.s Index: sys/boot/pc98/kgzldr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/boot/pc98/kgzldr/Makefile,v retrieving revision 1.4 diff -u -2 -r1.4 Makefile --- sys/boot/pc98/kgzldr/Makefile 2002/05/10 09:26:33 1.4 +++ sys/boot/pc98/kgzldr/Makefile 2002/09/16 02:07:23 @@ -5,9 +5,5 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding -.if ${OBJFORMAT} == aout -CFLAGS+=-O2 -.else CFLAGS+=-Os -.endif CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r @@ -21,5 +17,4 @@ M4?= m4 -M4FLAGS=-DOBJFORMAT=${OBJFORMAT} BOOT_COMCONSOLE_PORT?= 0x238 Index: sys/conf/Makefile.powerpc =================================================================== RCS file: /home/ncvs/src/sys/conf/Makefile.powerpc,v retrieving revision 1.263 diff -u -2 -r1.263 Makefile.powerpc --- sys/conf/Makefile.powerpc 2002/07/31 14:59:05 1.263 +++ sys/conf/Makefile.powerpc 2002/09/16 02:07:23 @@ -38,5 +38,5 @@ CWARNFLAGS=-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -COPTS+= -D__ELF__ -D__FreeBSD__ +COPTS+= -D__FreeBSD__ .endif Index: sys/conf/kern.post.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.post.mk,v retrieving revision 1.28 diff -u -2 -r1.28 kern.post.mk --- sys/conf/kern.post.mk 2002/08/19 01:00:37 1.28 +++ sys/conf/kern.post.mk 2002/09/16 02:07:23 @@ -53,6 +53,5 @@ kernel-clean: rm -f *.o *.so *.So *.ko *.s eddep errs \ - ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \ - setdef[01].c setdefs.h tags \ + ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags \ vers.c vnode_if.c vnode_if.h \ ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ @@ -78,5 +77,5 @@ assym.s: $S/kern/genassym.sh genassym.o - NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET} + NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} # XXX used to force -elf after CFLAGS to work around breakage of cc -aout Index: sys/conf/kern.pre.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.pre.mk,v retrieving revision 1.17 diff -u -2 -r1.17 kern.pre.mk --- sys/conf/kern.pre.mk 2002/08/14 17:55:11 1.17 +++ sys/conf/kern.pre.mk 2002/09/16 02:07:23 @@ -32,11 +32,4 @@ INCLUDES+= -I$S/contrib/ipfilter -# This hack is to allow kernel compiles to succeed on machines w/out srcdist -.if exists($S/../include) -INCLUDES+= -I$S/../include -.else -INCLUDES+= -I/usr/include -.endif - COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common @@ -44,9 +37,4 @@ # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} - -# Select the correct set of tools. Can't set OBJFORMAT here because it -# doesn't get exported into the environment, and if it were exported -# then it might break building of utilities. -CFLAGS+= ${FMT} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 Index: sys/conf/kmod.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kmod.mk,v retrieving revision 1.128 diff -u -2 -r1.128 kmod.mk --- sys/conf/kmod.mk 2002/07/29 09:40:15 1.128 +++ sys/conf/kmod.mk 2002/09/16 02:07:23 @@ -107,9 +107,4 @@ CFLAGS+= ${DEBUG_FLAGS} -.if ${OBJFORMAT} == elf -CLEANFILES+= setdef0.c setdef1.c setdefs.h -CLEANFILES+= setdef0.o setdef1.o -.endif - OBJS+= ${SRCS:N*.h:R:S/$/.o/g} Index: sys/i386/i386/bioscall.s =================================================================== RCS file: /home/ncvs/src/sys/i386/i386/bioscall.s,v retrieving revision 1.10 diff -u -2 -r1.10 bioscall.s --- sys/i386/i386/bioscall.s 2001/02/25 07:44:39 1.10 +++ sys/i386/i386/bioscall.s 2002/09/16 02:07:24 @@ -64,9 +64,5 @@ movl 20(%ebp),%edi pushl %ebp -#ifdef __AOUT__ - lcall bioscall_vector /* Stupid a.out gas! */ -#else lcall *bioscall_vector -#endif popl %ebp movl %eax,0(%ebp) @@ -132,9 +128,5 @@ .globl CNAME(bios16_jmp) CNAME(bios16_jmp): -#ifdef __AOUT__ - lcallw bioscall_vector /* Stupid a.out gas! */ -#else lcallw *bioscall_vector /* 16-bit call */ -#endif jc 1f Index: sys/i386/i386/locore.s =================================================================== RCS file: /home/ncvs/src/sys/i386/i386/locore.s,v retrieving revision 1.158 diff -u -2 -r1.158 locore.s --- sys/i386/i386/locore.s 2002/07/12 07:56:08 1.158 +++ sys/i386/i386/locore.s 2002/09/16 02:07:24 @@ -59,10 +59,4 @@ #include "assym.s" -#ifdef __AOUT__ -#define etext _etext -#define edata _edata -#define end _end -#endif - /* * XXX Index: sys/i386/include/asm.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/asm.h,v retrieving revision 1.8 diff -u -2 -r1.8 asm.h --- sys/i386/include/asm.h 2002/03/23 02:01:27 1.8 +++ sys/i386/include/asm.h 2002/09/16 02:07:24 @@ -70,11 +70,6 @@ * to a possibly-modified form that will be invisible to C programs. */ -#ifdef __ELF__ #define CNAME(csym) csym #define HIDENAME(asmsym) __CONCAT(.,asmsym) -#else -#define CNAME(csym) __CONCAT(_,csym) -#define HIDENAME(asmsym) asmsym -#endif /* XXX should use .p2align 4,0x90 for -m486. */ @@ -104,9 +99,5 @@ #undef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) -#ifdef __ELF__ #define __FBSDID(s) .ident s -#else -#define __FBSDID(s) .data ; .asciz s ; .previous -#endif #else #define __FBSDID(s) /* nothing */ Index: sys/i386/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/param.h,v retrieving revision 1.64 diff -u -2 -r1.64 param.h --- sys/i386/include/param.h 2002/08/31 21:15:29 1.64 +++ sys/i386/include/param.h 2002/09/16 02:07:24 @@ -74,11 +74,4 @@ #define MID_MACHINE MID_I386 -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf", "aout" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 16 Index: sys/i386/include/profile.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/profile.h,v retrieving revision 1.28 diff -u -2 -r1.28 profile.h --- sys/i386/include/profile.h 2002/04/21 10:49:00 1.28 +++ sys/i386/include/profile.h 2002/09/16 02:07:24 @@ -146,9 +146,5 @@ __BEGIN_DECLS #ifdef __GNUC__ -#ifdef __ELF__ void mcount(void) __asm(".mcount"); -#else -void mcount(void) __asm("mcount"); -#endif #endif static void _mcount(uintfptr_t frompc, uintfptr_t selfpc); Index: sys/ia64/ia64/interrupt.c =================================================================== RCS file: /home/ncvs/src/sys/ia64/ia64/interrupt.c,v retrieving revision 1.25 diff -u -2 -r1.25 interrupt.c --- sys/ia64/ia64/interrupt.c 2002/05/19 04:42:19 1.25 +++ sys/ia64/ia64/interrupt.c 2002/09/16 02:07:24 @@ -38,6 +38,4 @@ #include /* RCS ID & Copyright macro defns */ -/* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ - #include #include Index: sys/ia64/include/asm.h =================================================================== RCS file: /home/ncvs/src/sys/ia64/include/asm.h,v retrieving revision 1.8 diff -u -2 -r1.8 asm.h --- sys/ia64/include/asm.h 2002/05/13 04:58:12 1.8 +++ sys/ia64/include/asm.h 2002/09/16 02:07:24 @@ -165,34 +165,11 @@ * WEAK_ALIAS: create a weak alias (ELF only). */ -#ifdef __ELF__ #define WEAK_ALIAS(alias,sym) \ .weak alias; \ alias = sym -#endif /* - * Kernel RCS ID tag and copyright macros + * ID tag macros */ - -#ifdef _KERNEL - -#ifdef __ELF__ -#define __KERNEL_SECTIONSTRING(_sec, _str) \ - .section _sec ; .asciz _str ; .text -#else /* __ELF__ */ -#define __KERNEL_SECTIONSTRING(_sec, _str) \ - .data ; .asciz _str ; .align 3 ; .text -#endif /* __ELF__ */ - -#define __KERNEL_RCSID(_n, _s) __KERNEL_SECTIONSTRING(.ident, _s) -#define __KERNEL_COPYRIGHT(_n, _s) __KERNEL_SECTIONSTRING(.copyright, _s) - -#ifdef NO_KERNEL_RCSIDS -#undef __KERNEL_RCSID -#define __KERNEL_RCSID(_n, _s) /* nothing */ -#endif - -#endif /* _KERNEL */ - #if !defined(lint) && !defined(STRIP_FBSDID) #define __FBSDID(s) .ident s Index: sys/ia64/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/ia64/include/param.h,v retrieving revision 1.11 diff -u -2 -r1.11 param.h --- sys/ia64/include/param.h 2002/05/19 04:42:19 1.11 +++ sys/ia64/include/param.h 2002/09/16 02:07:24 @@ -88,11 +88,4 @@ #define MID_MACHINE MID_IA64 -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 16 Index: sys/kern/link_elf.c =================================================================== RCS file: /home/ncvs/src/sys/kern/link_elf.c,v retrieving revision 1.59 diff -u -2 -r1.59 link_elf.c --- sys/kern/link_elf.c 2002/08/29 01:16:14 1.59 +++ sys/kern/link_elf.c 2002/09/16 02:07:24 @@ -56,7 +56,4 @@ #include -#ifdef __AOUT__ -#include -#endif #include @@ -178,5 +175,4 @@ link_elf_init(void* arg) { -#ifdef __ELF__ Elf_Dyn *dp; caddr_t modptr, baseptr, sizeptr; @@ -186,9 +182,7 @@ char *newfilename; #endif -#endif linker_add_class(&link_elf_class); -#ifdef __ELF__ dp = (Elf_Dyn*) &_DYNAMIC; modname = NULL; @@ -240,6 +234,4 @@ r_debug_state(NULL, NULL); /* say hello to gdb! */ -#endif - #endif } Index: sys/modules/oltr/Makefile =================================================================== RCS file: /home/ncvs/src/sys/modules/oltr/Makefile,v retrieving revision 1.2 diff -u -2 -r1.2 Makefile --- sys/modules/oltr/Makefile 2002/01/11 15:48:56 1.2 +++ sys/modules/oltr/Makefile 2002/09/16 02:07:25 @@ -12,5 +12,5 @@ trlld.o: - uudecode < ${.CURDIR}/../../contrib/dev/oltr/i386-${OBJFORMAT}.trlld.o.uu + uudecode < ${.CURDIR}/../../contrib/dev/oltr/i386-elf.trlld.o.uu opt_inet.h: Index: sys/pc98/apm/apm_bioscall.s =================================================================== RCS file: /home/ncvs/src/sys/pc98/apm/apm_bioscall.s,v retrieving revision 1.2 diff -u -2 -r1.2 apm_bioscall.s --- sys/pc98/apm/apm_bioscall.s 2001/04/01 07:08:13 1.2 +++ sys/pc98/apm/apm_bioscall.s 2002/09/16 02:07:26 @@ -62,9 +62,5 @@ pushfl cli -#ifdef __AOUT__ - lcall bioscall_vector /* Stupid a.out gas! */ -#else lcall *bioscall_vector -#endif movl %eax,%edi movl %edx,%esi Index: sys/powerpc/include/asm.h =================================================================== RCS file: /home/ncvs/src/sys/powerpc/include/asm.h,v retrieving revision 1.4 diff -u -2 -r1.4 asm.h --- sys/powerpc/include/asm.h 2002/05/17 01:44:54 1.4 +++ sys/powerpc/include/asm.h 2002/09/16 02:07:26 @@ -85,9 +85,7 @@ #endif /* not lint and not STRIP_FBSDID */ -#ifdef __ELF__ #define WEAK_ALIAS(alias,sym) \ .weak alias; \ alias = sym -#endif #ifdef __STDC__ Index: sys/powerpc/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/powerpc/include/param.h,v retrieving revision 1.7 diff -u -2 -r1.7 param.h --- sys/powerpc/include/param.h 2002/05/14 20:35:28 1.7 +++ sys/powerpc/include/param.h 2002/09/16 02:07:26 @@ -81,11 +81,4 @@ #endif -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 2 Index: sys/sparc64/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/sparc64/include/param.h,v retrieving revision 1.13 diff -u -2 -r1.13 param.h --- sys/sparc64/include/param.h 2002/05/14 20:35:28 1.13 +++ sys/sparc64/include/param.h 2002/09/16 02:07:26 @@ -70,11 +70,4 @@ #define MID_MACHINE MID_SPARC64 -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 16 Index: sys/sys/cdefs.h =================================================================== RCS file: /home/ncvs/src/sys/sys/cdefs.h,v retrieving revision 1.60 diff -u -2 -r1.60 cdefs.h --- sys/sys/cdefs.h 2002/09/15 14:17:29 1.60 +++ sys/sys/cdefs.h 2002/09/16 02:07:26 @@ -185,5 +185,4 @@ #define __strong_reference(sym,aliassym) \ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))); -#ifdef __ELF__ #ifdef __STDC__ #define __weak_reference(sym,alias) \ @@ -203,29 +202,8 @@ __asm__(".previous") #endif /* __STDC__ */ -#else /* !__ELF__ */ -#ifdef __STDC__ -#define __weak_reference(sym,alias) \ - __asm__(".stabs \"_" #alias "\",11,0,0,0"); \ - __asm__(".stabs \"_" #sym "\",1,0,0,0") -#define __warn_references(sym,msg) \ - __asm__(".stabs \"" msg "\",30,0,0,0"); \ - __asm__(".stabs \"_" #sym "\",1,0,0,0") -#else -#define __weak_reference(sym,alias) \ - __asm__(".stabs \"_/**/alias\",11,0,0,0"); \ - __asm__(".stabs \"_/**/sym\",1,0,0,0") -#define __warn_references(sym,msg) \ - __asm__(".stabs msg,30,0,0,0"); \ - __asm__(".stabs \"_/**/sym\",1,0,0,0") -#endif /* __STDC__ */ -#endif /* __ELF__ */ #endif /* __GNUC__ */ #ifdef __GNUC__ -#ifdef __ELF__ #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"") -#else -#define __IDSTRING(name,string) __asm__(".data\n\t.asciz\t\"" string "\"\n\t.previous") -#endif #else /* Index: sys/sys/linker_set.h =================================================================== RCS file: /home/ncvs/src/sys/sys/linker_set.h,v retrieving revision 1.11 diff -u -2 -r1.11 linker_set.h --- sys/sys/linker_set.h 2002/09/11 19:08:09 1.11 +++ sys/sys/linker_set.h 2002/09/16 02:07:26 @@ -35,8 +35,6 @@ * are collected by the linker into a `linker_set' as defined below. * For ELF, this is done by constructing a separate segment for each set. - * For a.out, it is done automatically by the linker. */ -#if defined(__ELF__) /* * Private macros, not to be used outside this header file. @@ -73,50 +71,4 @@ #define SET_LIMIT(set) \ (&__CONCAT(__stop_set_,set)) - -#else /* __ELF__ */ - -/* - * The old way. This depends on GNU ld extensions that are not widely - * available outside of the a.out format. - * - * NB: the constants defined below must match those defined in - * ld/ld.h. Since their calculation requires arithmetic, we - * can't name them symbolically (e.g., 23 is N_SETT | N_EXT). - * - * In the __MAKE_SET macro below, the line: - * static void const * const __set_##set##_sym_##sym = &sym; - * is present only to prevent the compiler from producing bogus - * warnings about unused symbols. - */ -/* Private macros */ -#ifdef __UNDERSCORES__ -#define __MAKE_SET(set, sym, type) \ - static void const * const __set_##set##_sym_##sym = &sym; \ - __asm(".stabs \"_" #set "\", " #type ", 0, 0, _" #sym) -#else -#define __MAKE_SET(set, sym, type) \ - static void const * const __set_##set##_sym_##sym = &sym; \ - __asm(".stabs \"" #set "\", " #type ", 0, 0, " #sym) -#endif - -/* Public Macros */ -#define TEXT_SET(set, sym) __MAKE_SET(set, sym, 23) -#define DATA_SET(set, sym) __MAKE_SET(set, sym, 25) -#define BSS_SET(set, sym) __MAKE_SET(set, sym, 27) -#define ABS_SET(set, sym) __MAKE_SET(set, sym, 21) -#define SET_ENTRY(set, sym) error error must provide text/data type - -#define SET_DECLARE(set, ptype) \ - extern struct { \ - int ls_length; \ - ptype *ls_items[1]; \ - } set - -#define SET_BEGIN(set) \ - (&((set).ls_items[0])) -#define SET_LIMIT(set) \ - (&((set).ls_items[(set).ls_length])) - -#endif /* __ELF__ */ /* Index: sys/x86_64/include/param.h =================================================================== RCS file: /home/ncvs/src/sys/x86_64/include/param.h,v retrieving revision 1.1 diff -u -2 -r1.1 param.h --- sys/x86_64/include/param.h 2002/06/30 07:42:36 1.1 +++ sys/x86_64/include/param.h 2002/09/16 02:07:26 @@ -85,11 +85,4 @@ #define MID_MACHINE MID_X86_64 -/* - * OBJFORMAT_NAMES is a comma-separated list of the object formats - * that are supported on the architecture. - */ -#define OBJFORMAT_NAMES "elf" -#define OBJFORMAT_DEFAULT "elf" - #ifdef SMP #define MAXCPU 16 Index: tools/tools/kernxref/kernxref.sh =================================================================== RCS file: /home/ncvs/src/tools/tools/kernxref/kernxref.sh,v retrieving revision 1.16 diff -u -2 -r1.16 kernxref.sh --- tools/tools/kernxref/kernxref.sh 2002/07/19 10:29:07 1.16 +++ tools/tools/kernxref/kernxref.sh 2002/09/16 02:07:26 @@ -17,11 +17,6 @@ cd ${COMPILEDIR}/${KERNELNAME} -if file vers.o | grep -q ELF; then - OBJFORMAT=elf; -else - OBJFORMAT=aout; -fi -OBJFORMAT=${OBJFORMAT} nm -gon `echo *.o /boot/kernel/*.ko \ +nm -gon `echo *.o /boot/kernel/*.ko \ | tr ' ' '\012' \ | egrep -v '(aicasm|genassym)'` \ Index: usr.bin/Makefile =================================================================== RCS file: /home/ncvs/src/usr.bin/Makefile,v retrieving revision 1.220 diff -u -2 -r1.220 Makefile --- usr.bin/Makefile 2002/09/13 18:29:08 1.220 +++ usr.bin/Makefile 2002/09/16 02:07:26 @@ -228,15 +228,9 @@ .if ${MACHINE_ARCH} == "i386" # Things that don't compile on alpha or are aout specific: -SUBDIR+=ar \ - doscmd \ +SUBDIR+=doscmd \ ncplist \ ncplogin \ - nm \ - ranlib \ sasc \ - size \ - smbutil \ - strings \ - strip + smbutil .endif Index: usr.bin/doscmd/Makefile =================================================================== RCS file: /home/ncvs/src/usr.bin/doscmd/Makefile,v retrieving revision 1.34 diff -u -2 -r1.34 Makefile --- usr.bin/doscmd/Makefile 2002/07/29 09:40:15 1.34 +++ usr.bin/doscmd/Makefile 2002/09/16 02:07:26 @@ -15,12 +15,5 @@ XINCDIR= ${DESTDIR}${X11BASE}/include -.if ${OBJFORMAT} == "aout" -CLEANFILES+= doscmd.kernel crt0.o doscmd_loader.o -XLIBDIR= ${DESTDIR}${X11BASE}/lib/aout -LDADD= -L${DESTDIR}${LIBDIR} -lgcc -lc -DPADD= ${LIBGCC} ${LIBC} -.else XLIBDIR= ${DESTDIR}${X11BASE}/lib -.endif EXEGRP:= ${BINGRP} @@ -38,9 +31,5 @@ beforeinstall: -.if ${OBJFORMAT} == "aout" ${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ - doscmd.kernel ${DESTDIR}/usr/libexec/ -.endif - ${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \ emsdriv.sys redir.com ${DESTDIR}/usr/libdata/doscmd/ ${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \ @@ -50,17 +39,5 @@ fonts.dir ${DESTDIR}/usr/libdata/doscmd/fonts -.if ${OBJFORMAT} == "aout" -doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC} - ${CC} ${CFLAGS} ${LDFLAGS} -nostdlib -Wl,-e,start,-dc,-dp \ - -o doscmd ${LIBCRT0} doscmd_loader.o -lgcc -lc - -# Bogusly generated dependency to get doscmd_loader.c looked at by mkdep. -.depend: doscmd_loader.c - -# Bogus dependencies to get more than one binary created by `make all'. -doscmd: ${FONTFILES} ${FONTHDRS} doscmd.kernel emsdriv.sys redir.com -.else doscmd: ${FONTFILES} ${FONTHDRS} emsdriv.sys redir.com -.endif cp437-8x8.pcf.gz: cp437-8x8.pcf.gz.uu @@ -97,10 +74,2 @@ .include - -.if ${OBJFORMAT} == "aout" -# This must be after bsd.prog.mk is included so that ${OBJS} in the -# dependency gets expanded. -doscmd.kernel: crt0.o ${OBJS} ${DPADD} - ${CC} ${CFLAGS} ${LDFLAGS} -static -nostdlib -Wl,-N,-T,110000 \ - -o doscmd.kernel crt0.o ${OBJS} ${LDADD} -.endif Index: usr.bin/ldd/sods.c =================================================================== RCS file: /home/ncvs/src/usr.bin/ldd/sods.c,v retrieving revision 1.14 diff -u -2 -r1.14 sods.c --- usr.bin/ldd/sods.c 2002/04/28 12:55:35 1.14 +++ usr.bin/ldd/sods.c 2002/09/16 02:07:27 @@ -35,6 +35,4 @@ #include -#define FREEBSD_AOUT - #include #include @@ -42,5 +40,5 @@ #include #include -#include +#include #include #include Index: usr.bin/objformat/Makefile =================================================================== RCS file: /home/ncvs/src/usr.bin/objformat/Makefile,v retrieving revision 1.17 diff -u -2 -r1.17 Makefile --- usr.bin/objformat/Makefile 2002/02/08 22:31:43 1.17 +++ usr.bin/objformat/Makefile 2002/09/16 02:07:27 @@ -2,20 +2,4 @@ PROG= objformat -NOSHARED?= YES - -LINKS+= ${BINDIR}/objformat ${BINDIR}/addr2line -LINKS+= ${BINDIR}/objformat ${BINDIR}/ar -LINKS+= ${BINDIR}/objformat ${BINDIR}/as -LINKS+= ${BINDIR}/objformat ${BINDIR}/c++filt -LINKS+= ${BINDIR}/objformat ${BINDIR}/gasp -LINKS+= ${BINDIR}/objformat ${BINDIR}/gdb -LINKS+= ${BINDIR}/objformat ${BINDIR}/ld -LINKS+= ${BINDIR}/objformat ${BINDIR}/nm -LINKS+= ${BINDIR}/objformat ${BINDIR}/objcopy -LINKS+= ${BINDIR}/objformat ${BINDIR}/objdump -LINKS+= ${BINDIR}/objformat ${BINDIR}/ranlib -LINKS+= ${BINDIR}/objformat ${BINDIR}/size -LINKS+= ${BINDIR}/objformat ${BINDIR}/strings -LINKS+= ${BINDIR}/objformat ${BINDIR}/strip .include Index: usr.bin/objformat/objformat.1 =================================================================== RCS file: /home/ncvs/src/usr.bin/objformat/objformat.1,v retrieving revision 1.8 diff -u -2 -r1.8 objformat.1 --- usr.bin/objformat/objformat.1 2002/04/20 12:16:15 1.8 +++ usr.bin/objformat/objformat.1 2002/09/16 02:07:27 @@ -31,55 +31,11 @@ .Sh NAME .Nm objformat -.Nd reports default binary format and program deflector +.Nd reports default binary format .Sh SYNOPSIS .Nm -.Nm prog .Sh DESCRIPTION -If run as -.Nm -the default object file format is reported. The two different object file -formats are -.Ar aout -and +This program os obsolete and is now just a compatability stub. +It reports the object file format as .Ar elf . -.Pp -If invoked by any other name, -.Nm prog -is expanded to -.Pa /usr/libexec//prog -and executed. -.Sh DIAGNOSTICS -The -.Nm -utility returns with exit code 1 -if called with an improper number of arguments, or if -.Nm prog -could not be executed. -.Sh ENVIRONMENT -.Bl -tag -width OBJFORMAT_PATH -.It Ev OBJFORMAT -If the environment variable -.Ev OBJFORMAT -is set, it overrides the default object file format. -.Ev OBJFORMAT takes precedence over -.Pa /etc/objformat . -.It Ev OBJFORMAT_PATH -If the environment variable -.Ev OBJFORMAT_PATH -is set, its value is used as the base path to -.Nm prog . -The default is -.Pa /usr/libexec . -.El -.Sh FILES -.Bl -tag -width /etc/objformat -compact -.It Pa /etc/objformat -If present, specifies the object file format to use. Syntax is -.Ql OBJFORMAT=xxx . -.El -.Sh SEE ALSO -.Xr file 1 , -.Xr getobjformat 3 -.\" .Sh STANDARDS .Sh HISTORY The @@ -87,4 +43,12 @@ command appeared in .Fx 3.0 . +.Pp +The +.Nm +program was deprecated in +.Fx 4.0 +and reduced to a compatability stub in +.Fx 5.0 . +It will be completely removed before the next release. .Sh AUTHORS .An -nosplit @@ -95,3 +59,2 @@ This manual page was written by .An David O'Brien Aq obrien@NUXI.com . -.\" .Sh BUGS Index: usr.bin/objformat/objformat.c =================================================================== RCS file: /home/ncvs/src/usr.bin/objformat/objformat.c,v retrieving revision 1.8 diff -u -2 -r1.8 objformat.c --- usr.bin/objformat/objformat.c 2002/04/22 13:44:38 1.8 +++ usr.bin/objformat/objformat.c 2002/09/16 02:07:27 @@ -27,57 +27,12 @@ */ -#include -#include -#include -#include -#include #include +#include int main(int argc, char **argv) { - char objformat[32]; - char *path, *chunk; - char *cmd, *newcmd = NULL; - const char *objformat_path; - - if (getobjformat(objformat, sizeof objformat, &argc, argv) == -1) - errx(1, "Invalid object format"); - - cmd = strrchr(argv[0], '/'); - if (cmd != NULL) - cmd++; - else - cmd = argv[0]; - - if (strcmp(cmd, "objformat") == 0) { - if (argc != 1) { - fprintf(stderr, "usage: objformat\n"); - exit(1); - } - printf("%s\n", objformat); - exit(0); - } - - /* 'make world' glue */ - objformat_path = getenv("OBJFORMAT_PATH"); - if (objformat_path == NULL) - objformat_path = "/usr/libexec"; - path = strdup(objformat_path); - - setenv("OBJFORMAT", objformat, 1); - - while ((chunk = strsep(&path, ":")) != NULL) { - if (newcmd != NULL) { - free(newcmd); - newcmd = NULL; - } - asprintf(&newcmd, "%s/%s/%s", chunk, objformat, cmd); - if (newcmd == NULL) - err(1, "cannot allocate memory for new command"); - argv[0] = newcmd; - execv(newcmd, argv); - } - err(1, "could not exec %s/%s in %s", objformat, cmd, objformat_path); + write(1, "elf\n", 4); + return (0); } Index: usr.bin/xlint/lint1/Makefile =================================================================== RCS file: /home/ncvs/src/usr.bin/xlint/lint1/Makefile,v retrieving revision 1.14 diff -u -2 -r1.14 Makefile --- usr.bin/xlint/lint1/Makefile 2002/03/20 18:25:50 1.14 +++ usr.bin/xlint/lint1/Makefile 2002/09/16 02:07:27 @@ -14,10 +14,9 @@ BINDIR= /usr/libexec -OBJFORMAT_PATH?= ${BINDIR} # src/Makefile.inc1 sets this .PATH: ${.CURDIR}/../common lint.7: makeman - sh ${.CURDIR}/makeman ${OBJFORMAT_PATH}/${PROG} -m >${.TARGET} + sh ${.CURDIR}/makeman ${BINDIR}/${PROG} -m >${.TARGET} .include Index: usr.sbin/keyserv/Makefile =================================================================== RCS file: /home/ncvs/src/usr.sbin/keyserv/Makefile,v retrieving revision 1.11 diff -u -2 -r1.11 Makefile --- usr.sbin/keyserv/Makefile 2001/07/30 11:18:09 1.11 +++ usr.sbin/keyserv/Makefile 2002/09/16 02:07:27 @@ -6,7 +6,4 @@ CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. -.if $(OBJFORMAT) == elf -CFLAGS+= -DOBJFORMAT_ELF -.endif DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} Index: usr.sbin/keyserv/crypt_server.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/keyserv/crypt_server.c,v retrieving revision 1.8 diff -u -2 -r1.8 crypt_server.c --- usr.sbin/keyserv/crypt_server.c 2002/07/09 20:08:19 1.8 +++ usr.sbin/keyserv/crypt_server.c 2002/09/16 02:07:27 @@ -172,9 +172,5 @@ #ifndef LIBCRYPTO -#ifdef OBJFORMAT_ELF #define LIBCRYPTO "libcrypto.so.2" -#else -#define LIBCRYPTO "libcrypto.so.2." -#endif /* OBJFORMAT_ELF */ #endif @@ -186,35 +182,10 @@ if (libpath == NULL) { -#ifdef OBJFORMAT_ELF snprintf(dlpath, sizeof(dlpath), "%s/%s", _PATH_USRLIB, LIBCRYPTO); -#else - len = strlen(LIBCRYPTO); - if ((dird = opendir(_PATH_USRLIB)) == NULL) - err(1, "opendir(/usr/lib) failed"); - - while ((dirp = readdir(dird)) != NULL) { - /* must have a minor number */ - if (strlen(dirp->d_name) <= len) - continue; - if (!strncmp(dirp->d_name, LIBCRYPTO, len)) { - if (atoi((dirp->d_name + len + 1)) > minor) { - minor = atoi((dirp->d_name + len + 1)); - snprintf(dlpath,sizeof(dlpath),"%s/%s", - _PATH_USRLIB, dirp->d_name); - } - } - } - - closedir(dird); -#endif /* OBJFORMAT_ELF */ } else snprintf(dlpath, sizeof(dlpath), "%s", libpath); if (dlpath != NULL && (dlhandle = dlopen(dlpath, 0444)) != NULL) -#ifdef OBJFORMAT_ELF _my_crypt = (int (*)())dlsym(dlhandle, "_des_crypt"); -#else - _my_crypt = (int (*)())dlsym(dlhandle, "__des_crypt"); -#endif /* OBJFORMAT_ELF */ if (_my_crypt == NULL) {