9 files changed, 33 insertions, 18 deletions
diff --git a/stand/Makefile.inc b/stand/Makefile.inc
index 5d55c4e4a16f..2866ebd20af3 100644
--- a/stand/Makefile.inc
+++ b/stand/Makefile.inc
@@ -1,5 +1,7 @@
 SUBDIR_PARALLEL=	yes
 
+PACKAGE=		bootloader
+
 # Firmware may not be able to handle branch protection failures
 MK_BRANCH_PROTECTION=	no
 
diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile
index 313bb8030f3e..94dbd7af29d6 100644
--- a/stand/i386/boot2/Makefile
+++ b/stand/i386/boot2/Makefile
@@ -33,7 +33,8 @@ CFLAGS+=-fomit-frame-pointer \
 
 CFLAGS.gcc+=	-Os \
 		-fno-asynchronous-unwind-tables \
-		--param max-inline-insns-single=100
+		--param max-inline-insns-single=100 \
+		--param min-pagesize=1024
 
 CFLAGS.clang+=	-Oz ${CLANG_OPT_SMALL}
 
diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile
index a829be6c745d..366d82497819 100644
--- a/stand/i386/gptboot/Makefile
+++ b/stand/i386/gptboot/Makefile
@@ -34,7 +34,8 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Wno-pointer-sign
 
-CFLAGS.gcc+=	--param max-inline-insns-single=100
+CFLAGS.gcc+=	--param max-inline-insns-single=100 \
+		--param min-pagesize=1024
 
 LD_FLAGS+=${LD_FLAGS_BIN}
 
diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
index 0b67ff8cdaf4..ebdd4958c5f2 100644
--- a/stand/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
@@ -46,7 +46,8 @@ CFLAGS.clang+=	-Wno-tentative-definition-incomplete-type
 
 NO_WCAST_ALIGN=
 
-CFLAGS.gcc+=	--param max-inline-insns-single=100
+CFLAGS.gcc+=	--param max-inline-insns-single=100 \
+		--param min-pagesize=1024
 
 LD_FLAGS+=${LD_FLAGS_BIN}
 
diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile
index 0049e7fd3e0a..bf22e0f21d59 100644
--- a/stand/i386/isoboot/Makefile
+++ b/stand/i386/isoboot/Makefile
@@ -29,7 +29,8 @@ CFLAGS+=-DBOOTPROG=\"isoboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Wno-pointer-sign
 
-CFLAGS.gcc+=	--param max-inline-insns-single=100
+CFLAGS.gcc+=	--param max-inline-insns-single=100 \
+		--param min-pagesize=1024
 CFLAGS.clang+=  -Oz ${CLANG_OPT_SMALL}
 
 LD_FLAGS+=${LD_FLAGS_BIN}
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index f5a1acea843e..470c03032f61 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -189,9 +189,9 @@ SRCS+=	g_eli_hmac.c pkcs5v2.c
 .PATH: ${SYSDIR}/crypto/sha2
 SRCS+=		sha256c.c sha512c.c
 
-# md5 from the kernel
-.PATH: ${SYSDIR}/kern
+.PATH: ${SYSDIR}/crypto
 SRCS+=		md5c.c
+CFLAGS.md5c.c+= -DSTANDALONE_SMALL
 
 .if ${DO32:U0} == 0
 MAN=libsa.3
diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c
index 32cd198a9537..73b49a111f89 100644
--- a/stand/libsa/smbios.c
+++ b/stand/libsa/smbios.c
@@ -186,14 +186,17 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len)
 		     */
 		    SMBIOS_GET8(cp, 0x0a) != 0 &&
 		    smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) {
-#ifdef __ILP32__
+#if __SIZEOF_SIZE_T__ < 8
 			uint64_t end_addr;
 
 			end_addr = SMBIOS_GET64(cp, 0x10) + /* Start address. */
 			    SMBIOS_GET32(cp, 0x0c); /* Maximum size. */
-			/* Is the table (or part of it) located above 4G? */
-			if (end_addr >= (uint64_t)1 << 32)
-				/* Can't access it with 32-bit addressing. */
+			/*
+			 * Is the table (or part of it) located above what we
+			 * can address?
+			 */
+			if ((size_t)end_addr != end_addr)
+				/* Yes, give it up. */
 				continue;
 #endif
 			smbios.is_64bit_ep = 1;
diff --git a/stand/lua/cli.lua.8 b/stand/lua/cli.lua.8
index aee1d3d53579..e47ecd3d23db 100644
--- a/stand/lua/cli.lua.8
+++ b/stand/lua/cli.lua.8
@@ -52,10 +52,11 @@ For instance:
 local cli = require("cli")
 
 cli.foo = function(...)
-	-- Expand args to command name and the rest of argv.  These arguments
-	-- are pushed directly to the stack by loader, then handed off to
-	-- cli_execute.  cli_execute then passes them on to the invoked
-	-- function, where they appear as varargs that must be peeled apart into
+	-- Expand args to command name and the rest of argv.
+	-- These arguments are pushed directly to the stack by
+	-- loader, then handed off to cli_execute.  cli_execute
+	-- then passes them on to the invoked function, where
+	-- they appear as varargs that must be peeled apart into
 	-- their respective components.
 	local _, argv = cli.arguments(...)
 
@@ -63,10 +64,11 @@ cli.foo = function(...)
 	for k, v in ipairs(argv) do
 		print("arg #" .. tostring(k) .. ": '" .. v .. "'")
 	end
-	-- Perform a loader command directly.  This will not get dispatched back
-	-- to Lua, so it is acceptable to have a function of the exact same name
-	-- in loader.  Lua will have the first chance to handle any commands
-	-- executed at the loader prompt.
+	-- Perform a loader command directly.  This will not get
+	-- dispatched back to Lua, so it is acceptable to have a
+	-- function of the exact same name in loader.  Lua will
+	-- have the first chance to handle any commands executed
+	-- at the loader prompt.
 	loader.perform("foo")
 end
 .Ed
diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc
index 01b5f23410c8..392fd59a115f 100644
--- a/stand/userboot/Makefile.inc
+++ b/stand/userboot/Makefile.inc
@@ -1 +1,5 @@
 .include "../Makefile.inc"
+
+# userboot.so should be installed in the base bootloader package,
+# not bootloader-dev.
+NO_DEV_PACKAGE=