[src/trunk]: src/sys/arch Use a 32-bit daddr_t so that lib/libsa/{ufs, lfs}.c ...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8cb7dea0fc7e
branches:  trunk
changeset: 542580:8cb7dea0fc7e
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Feb 01 23:58:48 2003 +0000

description:
Use a 32-bit daddr_t so that lib/libsa/{ufs,lfs}.c don't pull in 64
bit divide and modulus library routines that break the tight space
constraints on bootblocks on these platforms.

May not be the final solution, but gets bootblocks building again.

diffstat:

 sys/arch/alpha/stand/bootxx_ffs/Makefile  |  4 +++-
 sys/arch/alpha/stand/bootxx_lfs/Makefile  |  4 +++-
 sys/arch/pmax/stand/bootxx_ffs/Makefile   |  4 +++-
 sys/arch/pmax/stand/bootxx_lfs/Makefile   |  4 +++-
 sys/arch/sbmips/stand/bootxx_ffs/Makefile |  4 +++-
 sys/arch/sbmips/stand/bootxx_lfs/Makefile |  4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diffs (96 lines):

diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/alpha/stand/bootxx_ffs/Makefile
--- a/sys/arch/alpha/stand/bootxx_ffs/Makefile  Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/alpha/stand/bootxx_ffs/Makefile  Sat Feb 01 23:58:48 2003 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2000/09/26 05:13:37 simonb Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/01 23:58:48 simonb Exp $
 
 PROG = bootxx_ffs
 CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=ufs \
            -DBOOTXX_FS_NAME='"FFS"' \
            -DBOOTXX_RAID1_SUPPORT \
            -DNO_GETCHAR
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 # not yet desired: -DBOOTXX_FS_TYPE=FS_BSDFFS
 
diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/alpha/stand/bootxx_lfs/Makefile
--- a/sys/arch/alpha/stand/bootxx_lfs/Makefile  Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/alpha/stand/bootxx_lfs/Makefile  Sat Feb 01 23:58:48 2003 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2000/09/26 05:13:37 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/01 23:58:48 simonb Exp $
 
 PROG = bootxx_lfs
 CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfs \
            -DBOOTXX_FS_NAME='"LFS"' \
            -DBOOTXX_RAID1_SUPPORT \
            -DNO_GETCHAR
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 # not yet desired: -DBOOTXX_FS_TYPE=FS_BSDLFS
 
diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/pmax/stand/bootxx_ffs/Makefile
--- a/sys/arch/pmax/stand/bootxx_ffs/Makefile   Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/pmax/stand/bootxx_ffs/Makefile   Sat Feb 01 23:58:48 2003 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1999/11/27 23:59:16 simonb Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:48 simonb Exp $
 
 PRIMARY_PROG=  bootxx_ffs
 CPPFLAGS+=     -DLIBSA_SINGLE_FILESYSTEM=ufs \
                -DBOOTXX_FS_NAME='"FFS"'
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 PRIMARY_MAX_LOAD!=     expr 8192 - 512
 
diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/pmax/stand/bootxx_lfs/Makefile
--- a/sys/arch/pmax/stand/bootxx_lfs/Makefile   Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/pmax/stand/bootxx_lfs/Makefile   Sat Feb 01 23:58:48 2003 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1999/11/27 23:59:16 simonb Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:49 simonb Exp $
 
 PRIMARY_PROG=  bootxx_lfs
 CPPFLAGS+=     -DLIBSA_SINGLE_FILESYSTEM=lfs \
                -DBOOTXX_FS_NAME='"LFS"'
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 PRIMARY_MAX_LOAD!=     expr 8192 - 512
 
diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/sbmips/stand/bootxx_ffs/Makefile
--- a/sys/arch/sbmips/stand/bootxx_ffs/Makefile Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/sbmips/stand/bootxx_ffs/Makefile Sat Feb 01 23:58:48 2003 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2002/11/09 06:20:38 cgd Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:49 simonb Exp $
 
 PROG = bootxx_ffs
 CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=ufs \
            -DBOOTXX_FS_NAME='"FFS"' \
            -DNO_GETCHAR
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 # not yet desired: -DBOOTXX_FS_TYPE=FS_BSDFFS
 
diff -r f2949cd1a12b -r 8cb7dea0fc7e sys/arch/sbmips/stand/bootxx_lfs/Makefile
--- a/sys/arch/sbmips/stand/bootxx_lfs/Makefile Sat Feb 01 23:47:02 2003 +0000
+++ b/sys/arch/sbmips/stand/bootxx_lfs/Makefile Sat Feb 01 23:58:48 2003 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2002/11/09 06:20:38 cgd Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:49 simonb Exp $
 
 PROG = bootxx_lfs
 CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfs \
            -DBOOTXX_FS_NAME='"LFS"' \
            -DNO_GETCHAR
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+=     -D__daddr_t=int32_t
 
 # not yet desired: -DBOOTXX_FS_TYPE=FS_BSDLFS