Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc/etc.sparc64 don't clobber INSTALLATION_DIRS, just add to...



details:   https://anonhg.NetBSD.org/src/rev/0dfd80efe0c4
branches:  trunk
changeset: 514127:0dfd80efe0c4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 23 14:40:21 2001 +0000

description:
don't clobber INSTALLATION_DIRS, just add to it.  add support for building
32 bit libraries, crt and ld.elf_so on 64 bit platforms (disabled by default).

diffstat:

 etc/etc.sparc64/Makefile.inc |  46 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 2 deletions(-)

diffs (67 lines):

diff -r 697fa07e285e -r 0dfd80efe0c4 etc/etc.sparc64/Makefile.inc
--- a/etc/etc.sparc64/Makefile.inc      Thu Aug 23 14:37:02 2001 +0000
+++ b/etc/etc.sparc64/Makefile.inc      Thu Aug 23 14:40:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.8 2001/08/19 14:18:39 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.9 2001/08/23 14:40:21 mrg Exp $
 #
 #      etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
 #
@@ -14,7 +14,7 @@
 # Add sparc64 installation directories
 MD_INSTALLATION_DIRS= \
        installation/miniroot installation/netboot installation/misc
-INSTALLATION_DIRS=$(MD_INSTALLATION_DIRS) 
+INSTALLATION_DIRS+=$(MD_INSTALLATION_DIRS) 
 
 snap_pre_md:
 .ifndef UPDATE
@@ -22,6 +22,48 @@
 .endif
 
 #
+# Build 32 bit lib/csu, lib, gnu/lib & libexec/ld.elf_so
+#
+.if (${MACHINE_ARCH} == sparc64 && ${MACHINE} == sparc64 && ${MK32BITLIBS} == yes)
+LIBDIR=/usr/lib/sparcv7
+BINDIR=/usr/libexec/sparcv7
+SPARC32=COPTS=-m32 LD="ld -m elf32_sparc" AS="as -32" \
+       MACHINE=sparc MACHINE_ARCH=sparc LIBDIR=${LIBDIR} BINDIR=${BINDIR} \
+       SHLIB_LDSTARTFILE=${DESTDIR}${LIBDIR}/crtbeginS.o \
+       SHLIB_LDENDFILE=${DESTDIR}${LIBDIR}/crtendS.o
+
+snap_md_pre:
+.if ${MKOBJDIRS} != "no"
+       (cd ${.CURDIR}/../lib/csu && \
+           ${MAKE} ${SPARC32} ${_M} obj)
+.endif
+       (cd ${.CURDIR}/../lib/csu && \
+           ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
+           ${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
+.if ${MKOBJDIRS} != "no"
+       (cd ${.CURDIR}/../lib && \
+           ${MAKE} ${SPARC32} ${_M} obj)
+.endif
+       (cd ${.CURDIR}/../lib && \
+           ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
+           ${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
+.if ${MKOBJDIRS} != "no"
+       (cd ${.CURDIR}/../gnu/lib && \
+           ${MAKE} ${SPARC32} ${_M} obj)
+.endif
+       (cd ${.CURDIR}/../gnu/lib && \
+           ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
+           ${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
+.if ${MKOBJDIRS} != "no"
+       (cd ${.CURDIR}/../libexec/ld.elf_so && \
+           ${MAKE} ${SPARC32} ${_M} obj)
+.endif
+       (cd ${.CURDIR}/../libexec/ld.elf_so && \
+           ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
+           ${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
+.endif
+
+#
 # Install miniroot images and auxiliary scripts to the release tree
 #
 snap_md_post:



Home | Main Index | Thread Index | Old Index