diff options
author | peter <peter@FreeBSD.org> | 2000-01-08 17:31:35 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-08 17:31:35 +0000 |
commit | 914c86f25f6f1a4fee9b74afbe179f473e97ebba (patch) | |
tree | 3d76fd9d330140dbaceb6d48b5bf807839e12aae /sys/i386/conf/Makefile.i386 | |
parent | 5450ed07f67edf6e215eb514d84d66e1bea6ea81 (diff) | |
download | FreeBSD-src-914c86f25f6f1a4fee9b74afbe179f473e97ebba.zip FreeBSD-src-914c86f25f6f1a4fee9b74afbe179f473e97ebba.tar.gz |
Further sync Alpha and i386 Makefiles. Remove KERNFORMAT = elf stuff as
it's always true on these platforms (and is likely to be on others as
well since loader is the one that is configured for whatever the boot
requirements are)
Diffstat (limited to 'sys/i386/conf/Makefile.i386')
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 8df5b3d..2ab77aa 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -21,7 +21,6 @@ # Can be overridden by makeoptions or /etc/make.conf KERNEL?= kernel -KERNFORMAT?= elf STD8X16FONT?= iso .if !defined(S) @@ -52,9 +51,7 @@ 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. -.if ${KERNFORMAT} == "elf" FMT= -elf -.endif CFLAGS+= ${FMT} LOAD_ADDRESS?= C0100000 @@ -84,8 +81,6 @@ GEN_CFILES= $S/$M/$M/genassym.c SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c SYSTEM_SFILES= $S/$M/$M/locore.s SYSTEM_DEP= Makefile ${SYSTEM_OBJS} - -.if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ setdef1.o hack.So SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \ @@ -93,7 +88,6 @@ SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/$M/conf/kernel.script -.endif %BEFORE_DEPEND @@ -114,12 +108,7 @@ FULLKERNEL= ${KERNEL} .else FULLKERNEL= ${KERNEL}.debug ${KERNEL}: ${FULLKERNEL} -.if ${KERNFORMAT} == "elf" objcopy --strip-debug ${FULLKERNEL} ${KERNEL} -.else - cp ${FULLKERNEL} ${KERNEL} - strip ${FMT} -d ${KERNEL} -.endif .endif ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @@ -147,7 +136,6 @@ clean: locore.o: $S/$M/$M/locore.s assym.s ${NORMAL_S} -.if ${KERNFORMAT} == elf # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. @@ -155,7 +143,6 @@ hack.So: Makefile touch hack.c ${CC} ${FMT} -shared -nostdlib hack.c -o hack.So rm -f hack.c -.endif .ORDER: setdefs.h setdef0.c setdef1.c |