Revert "mostly libsa"

This reverts accidentally pushed r325377.

sys/boot/defs.mk

@@ -84,7 +84,6 @@ CFLAGS+= -DLOADER_MBR_SUPPORT
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 CFLAGS+= -DLOADER_GELI_SUPPORT
 .endif
-.endif
 
 _ILINKS=machine
 .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"

sys/boot/libsa/Makefile

@@ -14,7 +14,7 @@ MK_SSP=		no
 .include "../Makefile.inc"
 
 INTERNALLIB=
-LIBSA_CPUARCH?=${MACHINE_CPUARCH}
+LIBSTAND_CPUARCH?=${MACHINE_CPUARCH}
 LIBC_SRC=	${SRCTOP}/lib/libc
 
 LIB?=		sa
@@ -83,7 +83,7 @@ SRCS+=	syncicache.c
 SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c
 
 # _setjmp/_longjmp
-.PATH: ${SASRC}/${LIBSA_CPUARCH}
+.PATH: ${SASRC}/${LIBSTAND_CPUARCH}
 SRCS+=	_setjmp.S
 
 # decompression functionality from libbz2

sys/boot/libsa32/Makefile

@@ -4,9 +4,9 @@
 
 LIB=sa32
 .if ${MACHINE_CPUARCH} == "amd64"
-LIBSA_CPUARCH=i386
+LIBSTAND_CPUARCH=i386
 .else
-LIBSA_CPUARCH=${MACHINE_CPUARCH}
+LIBSTAND_CPUARCH=${MACHINE_CPUARCH}
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"