Module Name: src
Committed By: lukem
Date: Fri Jun 2 20:49:07 UTC 2023
Modified Files:
src/etc/etc.sparc64: Makefile.inc
Log Message:
etc.sparc64: remove obsolete MK32BITLIBS
As there's a functional MKCOMPAT implementation, and
MK32BITLIBS=yes hasn't worked since 2002 (and noone
noticed the latter), remove obsolete MK32BITLIBS code.
Per confirmation from martin@, mrg@, and riastradh@ on ICB.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/etc/etc.sparc64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.sparc64/Makefile.inc
diff -u src/etc/etc.sparc64/Makefile.inc:1.34 src/etc/etc.sparc64/Makefile.inc:1.35
--- src/etc/etc.sparc64/Makefile.inc:1.34 Fri Jun 2 14:32:04 2023
+++ src/etc/etc.sparc64/Makefile.inc Fri Jun 2 20:49:07 2023
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.34 2023/06/02 14:32:04 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.35 2023/06/02 20:49:07 lukem Exp $
#
# etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
#
-# Specify whether or not to build 32-bit libs.
-MK32BITLIBS?=no
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
@@ -17,35 +15,7 @@ MD_INSTALLATION_DIRS= installation/minir
installation/misc
INSTALLATION_DIRS+= ${MD_INSTALLATION_DIRS}
-# Used by 32 bit lib/csu, lib, gnu/lib & libexec/ld.elf_so
-LIBDIR=/usr/lib/32
-BINDIR=/usr/libexec/32
-SPARC32_ENV=MACHINE=sparc MACHINE_ARCH=sparc
-SPARC32=COPTS=-m32 LD="ld -m elf32_sparc" AS="as -32" \
- LIBDIR=${LIBDIR} BINDIR=${BINDIR} \
- SHLIB_LDSTARTFILE=${DESTDIR}${LIBDIR}/crtbeginS.o \
- SHLIB_LDENDFILE=${DESTDIR}${LIBDIR}/crtendS.o
-
-
snap_md_post:
-
-.if ${MACHINE_ARCH} == "sparc64" && ${MK32BITLIBS} != "no"
-
- # build 32 bit programs
-.for _s64dir in lib/csu lib gnu/lib libexec/ld_elf.so
-.if ${MKOBJDIRS} != "no"
- (cd ${NETBSDSRCDIR}/${_s64dir} && \
- ${SPARC32_ENV} ${MAKE} ${SPARC32} ${_M} obj)
-.endif
-.if ${MKUPDATE} == "no"
- (cd ${NETBSDSRCDIR}/${_s64dir} && ${MAKE} cleandir)
-.endif
- (cd ${NETBSDSRCDIR}/${_s64dir} && \
- ${SPARC32_ENV} ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall \
- && ${SPARC32_ENV} ${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
-.endfor
-.endif # MACHINE_ARCH==sparc64 && MACHINE==sparc && MK32BITLIBS!=no
-
# Install miniroot images and auxiliary scripts to the release tree
.if exists($(XSRCDIR)/xc/Imakefile)
# build X11
