PERFORCE change 52436 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=52436

Change 52436 by peter at peter_daintree on 2004/05/07 09:06:49

	make the new-kld glue for amd64 only so its safer to commit

Affected files ...

.. //depot/projects/hammer/sys/conf/files#57 edit
.. //depot/projects/hammer/sys/conf/files.amd64#43 edit
.. //depot/projects/hammer/sys/conf/kmod.mk#23 edit

Differences ...

==== //depot/projects/hammer/sys/conf/files#57 (text+ko) ====

@@ -1086,7 +1086,6 @@
 kern/kern_uuid.c	standard
 kern/kern_xxx.c		standard
 kern/link_elf.c		standard
-kern/link_elf_obj.c	standard
 kern/md4c.c		optional netsmb
 kern/md5c.c		standard
 kern/sched_4bsd.c	optional sched_4bsd

==== //depot/projects/hammer/sys/conf/files.amd64#43 (text+ko) ====

@@ -129,6 +129,7 @@
 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

==== //depot/projects/hammer/sys/conf/kmod.mk#23 (text+ko) ====

@@ -137,12 +137,23 @@
 	${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
+
 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
@@ -158,7 +169,7 @@
 	xargs -J% ${OBJCOPY} % ${.TARGET}
 .endif
 .endif
-.if !defined(DEBUG_FLAGS)
+.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} != amd64
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif