Page MenuHomeFreeBSD
Files F140978398

D34281.id54425.diff
No OneTemporary
Actions

D34281.id54425.diff
View Options

diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -230,10 +230,12 @@
# 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.
-hack.pico: Makefile
- :> hack.c
- ${CC} ${CCLDFLAGS} -shared ${CFLAGS} -nostdlib hack.c -o hack.pico
- rm -f hack.c
+force-dynamic-hack.c:
+ :> ${.TARGET}
+
+force-dynamic-hack.pico: force-dynamic-hack.c Makefile
+ ${CC} ${CCLDFLAGS} -shared ${CFLAGS} -nostdlib \
+ force-dynamic-hack.c -o ${.TARGET}
offset.inc: $S/kern/genoffset.sh genoffset.o
NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genoffset.sh genoffset.o > ${.TARGET}
@@ -444,7 +446,7 @@
.if ${MK_REPRODUCIBLE_BUILD} != "no"
REPRO_FLAG="-R"
.endif
-vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
+vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*}
MAKE="${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT}
vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -314,7 +314,7 @@
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
-SYSTEM_OBJS+= hack.pico
+SYSTEM_OBJS+= force-dynamic-hack.pico
KEYMAP=kbdcontrol -P ${SRCTOP}/share/vt/keymaps -P ${SRCTOP}/share/syscons/keymaps
KEYMAP_FIX=sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /'

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 8:35 AM (13 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27406737
Default Alt Text
D34281.id54425.diff (1 KB)

Event Timeline