diff options
| author | bde <bde@FreeBSD.org> | 2003-12-29 11:34:33 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-12-29 11:34:33 +0000 |
| commit | 3631fbf9f2a96dac2e25079ae12139dcaf85100c (patch) | |
| tree | 14f730aabc0b50ca3ff4de543373759f79c03978 /sys/conf | |
| parent | c1c350094b7964bcd5d1eac88f9d127f973625fc (diff) | |
| download | FreeBSD-src-3631fbf9f2a96dac2e25079ae12139dcaf85100c.zip FreeBSD-src-3631fbf9f2a96dac2e25079ae12139dcaf85100c.tar.gz | |
Garbage-collected some vestiges of objformat support (mainly ${FMT}).
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.alpha | 2 | ||||
| -rw-r--r-- | sys/conf/kern.post.mk | 4 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 3055712..6bc7850 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -28,7 +28,7 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -e locorestart \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 96b02b4..0bc5801 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -103,7 +103,7 @@ lint: ${LNFILES} HACK_EXTRA_FLAGS?= -shared hack.So: Makefile touch hack.c - ${CC} ${FMT} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So + ${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So rm -f hack.c # This rule stops ./assym.s in .depend from causing problems. @@ -112,8 +112,6 @@ hack.So: Makefile assym.s: $S/kern/genassym.sh genassym.o NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET} -# XXX used to force -elf after CFLAGS to work around breakage of cc -aout -# (genassym.sh makes some assumptions and cc stopped satisfying them). genassym.o: $S/$M/$M/genassym.c ${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 9202d66..518c472 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -78,11 +78,11 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS} SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \ +SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ - ${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET} + ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} SYSTEM_DEP+= $S/conf/ldscript.$M # MKMODULESENV is set here so that port makefiles can augment |
