CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Sep 16 03:22:03 UTC 2009

Modified Files:
        src/sys/arch/mips/conf [matt-nb5-mips64]: Makefile.mips

Log Message:
When making a ELF64 kernel, use objcopy to make a ELF32 N32 version as well.
The loader can't tell and this avoid requiring 64bit aware bootloaders.


To generate a diff of this commit:
cvs rdiff -u -r1.50.24.2 -r1.50.24.3 src/sys/arch/mips/conf/Makefile.mips

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50.24.2 src/sys/arch/mips/conf/Makefile.mips:1.50.24.3
--- src/sys/arch/mips/conf/Makefile.mips:1.50.24.2	Fri Aug 21 17:34:09 2009
+++ src/sys/arch/mips/conf/Makefile.mips	Wed Sep 16 03:22:03 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.50.24.2 2009/08/21 17:34:09 matt Exp $
+#	$NetBSD: Makefile.mips,v 1.50.24.3 2009/09/16 03:22:03 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -55,10 +55,16 @@
 .if ${MACHINE_ARCH} == "mips64eb"
 LDFLAGS+=	-m elf64btsmip
 LINKFORMAT+=	-m elf64btsmip
+SYSTEM_LD_TAIL_EXTRA+= \
+		;echo ${OBJCOPY} -O elf32-nbigmips $@ $...@.elf32; \
+		${OBJCOPY} -O elf32-nbigmips $@ $...@.elf32
 .endif
 .if ${MACHINE_ARCH} == "mips64el"
 LDFLAGS+=	-m elf64ltsmip
 LINKFORMAT+=	-m elf64ltsmip
+SYSTEM_LD_TAIL_EXTRA+= \
+		;echo ${OBJCOPY} -O elf32-nlittlemips $@ $...@.elf32; \
+		${OBJCOPY} -O elf32-nlittlemips $@ $...@.elf32
 .endif
 .endif # LP64=yes
 AFLAGS+=	-mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}