git: 148211300870 - main - stand: Compile out the extensive superblock diagnostic messages for BIOS loader

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=148211300870b3bd558bf70dc3bf7d7f78c657aa

commit 148211300870b3bd558bf70dc3bf7d7f78c657aa
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-08-12 17:08:36 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-08-13 03:48:17 +0000

    stand: Compile out the extensive superblock diagnostic messages for BIOS loader
    
    The BIOS loader operates in a very constrained environment. The messages
    for the super block integrity tests take up about 12k of space. Compile
    them out for the BIOS loader, while leaving it intact for all other
    loaders that aren't space constrained. These aren't used in the 'super
    tiny' *boot* programs, so no adjustment is needed there.
    
    We reply on the fact that (a) i386 doesn't support 32-bit UEFI booting
    and (b) LIBSA_CPUARCH is "i386" when building on both i386 and when
    we're building the 32-bit libsa32 library.
    
    This saves about 12k of space for this constrained envrionment and will
    take a bit of the pressure off some machines where the loader has grown
    too big for their BIOS (see comments in i386/loader/Makefile for
    details).
    
    Sponsored by:           Netflix
    Reviewed by:            mckusick
    Differential Revision:  https://reviews.freebsd.org/D36175
---
 stand/libsa/Makefile   | 11 +++++++++++
 sys/ufs/ffs/ffs_subr.c |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index dc35fe007506..14b38298c3f0 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -170,6 +170,17 @@ SRCS+=	time.c
 .PATH: ${SRCTOP}/sys/ufs/ffs
 SRCS+=ffs_subr.c ffs_tables.c
 
+#
+# i386 has a constrained space for its /boot/loader, so compile out the
+# extensive messages diagnosing bad superblocks. i386 doesn't support UEFI
+# booting, so doing it always makes sense natively there. When we compile
+# for 32-bit on amd64, LIBSA_CPUARCH is also i386 and we use libsa32 only
+# for the BIOS /boot/loader which has the same constraints.
+#
+.if ${LIBSA_CPUARCH} == "i386"
+CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL
+.endif
+
 CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS}
 CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS}
 CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2  -DBZ_NO_STDIO -DBZ_NO_COMPRESS
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 8768c5588def..c6043765cfb0 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -323,7 +323,11 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int flags,
  * Verify the filesystem values.
  */
 #define ILOG2(num)	(fls(num) - 1)
-#define MPRINT		if (prtmsg) printf
+#ifdef STANDALONE_SMALL
+#define MPRINT(...)	do { } while (0)
+#else
+#define MPRINT(...)	if (prtmsg) printf(__VA_ARGS__)
+#endif
 #define FCHK(lhs, op, rhs, fmt)						\
 	if (lhs op rhs) {						\
 		MPRINT("UFS%d superblock failed: %s (" #fmt ") %s %s ("	\