CVS commit: src/etc/etc.sparc64
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
CVS commit: src/etc/etc.sparc64
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.
CVS commit: src/etc/etc.sparc64
Module Name:src
Committed By: lukem
Date: Fri Jun 2 14:32:04 UTC 2023
Modified Files:
src/etc/etc.sparc64: Makefile.inc
Log Message:
etc.sparc64: fix syntax errors in MK32BITLIBS=yes
sparc64 snapshots with MK32BITLIBS=yes has been broken
because of make(1) and sh(1) syntax errors since
my change in revision 1.18 on 2002-12-03, when
snap_md_pre target was deprecated...
Move the rules to snap_md_post and fix the syntax errors.
The cross-build make snapshot snapbecause of the missing
$TOOLDIR/bin/sparc--netbsdelf-gcc due to the invocation
with SPARC32_ENV=MACHINE=sparc MACHINE_ARCH=sparc.
A separate issue to resolve.
(It seems MK32BITLIBS hasn't worked for 20+ years and
noone noticed! Do we need it?)
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 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.33 src/etc/etc.sparc64/Makefile.inc:1.34
--- src/etc/etc.sparc64/Makefile.inc:1.33 Fri Jun 2 14:25:35 2023
+++ src/etc/etc.sparc64/Makefile.inc Fri Jun 2 14:32:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.33 2023/06/02 14:25:35 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.34 2023/06/02 14:32:04 lukem Exp $
#
# etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
#
@@ -26,6 +26,9 @@ SPARC32=COPTS=-m32 LD="ld -m elf32_sparc
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
@@ -35,7 +38,7 @@ SPARC32=COPTS=-m32 LD="ld -m elf32_sparc
${SPARC32_ENV} ${MAKE} ${SPARC32} ${_M} obj)
.endif
.if ${MKUPDATE} == "no"
- (cd ${NETBSDSRCDIR}/${_s64dir} && ${MAKE} cleandir
+ (cd ${NETBSDSRCDIR}/${_s64dir} && ${MAKE} cleandir)
.endif
(cd ${NETBSDSRCDIR}/${_s64dir} && \
${SPARC32_ENV} ${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall \
@@ -43,10 +46,7 @@ SPARC32=COPTS=-m32 LD="ld -m elf32_sparc
.endfor
.endif # MACHINE_ARCH==sparc64 && MACHINE==sparc && MK32BITLIBS!=no
-#
-# Install miniroot images and auxiliary scripts to the release tree
-#
-snap_md_post:
+ # Install miniroot images and auxiliary scripts to the release tree
.if exists($(XSRCDIR)/xc/Imakefile)
# build X11
.ifndef XSRC_DONE
@@ -73,6 +73,7 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/${dir} '*'
.endfor
+
ISOBOOTFILEDIR!=cd ${.CURDIR}/../distrib/${MACHINE}/bootfs && ${PRINTOBJDIR}
ISOBOOTFILE?= ${ISOBOOTFILEDIR}/boot.fs
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: lukem Date: Fri Jun 2 14:32:04 UTC 2023 Modified Files: src/etc/etc.sparc64: Makefile.inc Log Message: etc.sparc64: fix syntax errors in MK32BITLIBS=yes sparc64 snapshots with MK32BITLIBS=yes has been broken because of make(1) and sh(1) syntax errors since my change in revision 1.18 on 2002-12-03, when snap_md_pre target was deprecated... Move the rules to snap_md_post and fix the syntax errors. The cross-build make snapshot snapbecause of the missing $TOOLDIR/bin/sparc--netbsdelf-gcc due to the invocation with SPARC32_ENV=MACHINE=sparc MACHINE_ARCH=sparc. A separate issue to resolve. (It seems MK32BITLIBS hasn't worked for 20+ years and noone noticed! Do we need it?) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 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.
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: mrg Date: Mon Feb 23 13:52:51 UTC 2015 Modified Files: src/etc/etc.sparc64: ttys Log Message: add ttyC00/ttyC01 as found on eg, com(4)-based serial port systems like the sunblade 2500. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/etc/etc.sparc64/ttys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: mrg Date: Mon Feb 23 13:52:51 UTC 2015 Modified Files: src/etc/etc.sparc64: ttys Log Message: add ttyC00/ttyC01 as found on eg, com(4)-based serial port systems like the sunblade 2500. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/etc/etc.sparc64/ttys 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/ttys diff -u src/etc/etc.sparc64/ttys:1.10 src/etc/etc.sparc64/ttys:1.11 --- src/etc/etc.sparc64/ttys:1.10 Fri Mar 12 14:50:54 2010 +++ src/etc/etc.sparc64/ttys Mon Feb 23 13:52:51 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ttys,v 1.10 2010/03/12 14:50:54 roy Exp $ +# $NetBSD: ttys,v 1.11 2015/02/23 13:52:51 mrg Exp $ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # @@ -14,3 +14,5 @@ ttya /usr/libexec/getty std.9600 unkno ttyb /usr/libexec/getty std.9600 unknown off secure ttyh0 /usr/libexec/getty std.9600 unknown off secure ttyh1 /usr/libexec/getty std.9600 unknown off secure +ttyC00 /usr/libexec/getty std.9600 unknown off secure +ttyC01 /usr/libexec/getty std.9600 unknown off secure
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: jdc Date: Mon Jan 18 10:35:18 UTC 2010 Modified Files: src/etc/etc.sparc64: MAKEDEV.conf Log Message: Add RSC ports (ttyh2, ttyh3) to all_md. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/etc/etc.sparc64/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.sparc64
Module Name:src Committed By: jdc Date: Mon Jan 18 10:35:18 UTC 2010 Modified Files: src/etc/etc.sparc64: MAKEDEV.conf Log Message: Add RSC ports (ttyh2, ttyh3) to all_md. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/etc/etc.sparc64/MAKEDEV.conf 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/MAKEDEV.conf diff -u src/etc/etc.sparc64/MAKEDEV.conf:1.13 src/etc/etc.sparc64/MAKEDEV.conf:1.14 --- src/etc/etc.sparc64/MAKEDEV.conf:1.13 Sat Sep 13 11:46:18 2008 +++ src/etc/etc.sparc64/MAKEDEV.conf Mon Jan 18 10:35:18 2010 @@ -1,7 +1,8 @@ -# $NetBSD: MAKEDEV.conf,v 1.13 2008/09/13 11:46:18 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.14 2010/01/18 10:35:18 jdc Exp $ all_md) - makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01 ttyh0 ttyh1 + makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01 + makedev ttyh0 ttyh1 ttyh2 ttyh3 makedev sd0 sd1 sd2 sd3 sd4 ss0 ch0 uk0 uk1 makedev wd0 wd1 wd2 wd3 cd0 st0 st1 fd0 makedev audio
