Garbage-collected some vestiges of objformat support (mainly ${FMT}).
This commit is contained in:
parent
c52c3a23e9
commit
e1402a88c6
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user