From 796adb9625b7792d2bea9a65c8e5a898f5496d9d Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 4 Nov 2017 03:07:58 +0000
Subject: [PATCH] Revert "mostly libsa"

This reverts accidentally pushed r325377.
---
 sys/boot/defs.mk          | 1 -
 sys/boot/libsa/Makefile   | 4 ++--
 sys/boot/libsa32/Makefile | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys/boot/defs.mk b/sys/boot/defs.mk
index e0bd3023d91f..942ad381732c 100644
--- a/sys/boot/defs.mk
+++ b/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"
diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile
index 8ea42e389001..daf530d9f123 100644
--- a/sys/boot/libsa/Makefile
+++ b/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
diff --git a/sys/boot/libsa32/Makefile b/sys/boot/libsa32/Makefile
index 12ffcbb6da5b..f62b6d1d86ea 100644
--- a/sys/boot/libsa32/Makefile
+++ b/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"