aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2004-05-16 20:11:38 +0000
committerPeter Wemm <peter@FreeBSD.org>2004-05-16 20:11:38 +0000
commit4d6bcc8306fb1654e272830fe4c4989d599b0eb2 (patch)
tree8a3c1046638108e83671614c179a90220d808857 /sys/conf
parente8855d4f975f9d1b62f28eb2dbe90a8e4ce67038 (diff)
downloadsrc-4d6bcc8306fb1654e272830fe4c4989d599b0eb2.tar.gz
src-4d6bcc8306fb1654e272830fe4c4989d599b0eb2.zip
Enable first part of kld's on amd64. This is known to not work right
yet, but building kld's is OK now and they can be loaded by kldload(2). (but the machine will likely crash soon afterwards, a "minor" problem :-) Brought to you by: my injured knee (from moving)
Notes
Notes: svn path=/head/; revision=129283
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd641
-rw-r--r--sys/conf/kmod.mk9
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 0c1e106e1a6e..b24d28c0fa5d 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -128,6 +128,7 @@ isa/fd.c optional fdc
isa/psm.c optional psm
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
+kern/link_elf_obj.c standard
pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
pci/agp_i810.c optional agp
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index c3b642a0a6b6..fb123a20c68c 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -137,18 +137,24 @@ ${PROG}: ${FULLPROG}
${OBJCOPY} --strip-debug ${FULLPROG} ${PROG}
.endif
+.if ${MACHINE_ARCH} != amd64
${FULLPROG}: ${KMOD}.kld
${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
.if !defined(DEBUG_FLAGS)
${OBJCOPY} --strip-debug ${.TARGET}
.endif
+.endif
EXPORT_SYMS?= NO
.if ${EXPORT_SYMS} != YES
CLEANFILES+= ${.OBJDIR}/export_syms
.endif
+.if ${MACHINE_ARCH} != amd64
${KMOD}.kld: ${OBJS}
+.else
+${FULLPROG}: ${OBJS}
+.endif
${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
.if defined(EXPORT_SYMS)
.if ${EXPORT_SYMS} != YES
@@ -164,6 +170,9 @@ ${KMOD}.kld: ${OBJS}
xargs -J% ${OBJCOPY} % ${.TARGET}
.endif
.endif
+.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
+ ${OBJCOPY} --strip-debug ${.TARGET}
+.endif
_ILINKS=@ machine