From 5790d6ba6d15776a2805d03bd12ee9c8e4231c79 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sun, 11 Feb 2018 19:33:24 +0000
Subject: MFC Loader Fixes 2017q4p2: r324453, r324454

r324453: Create sys/boot/libsa and build libstand.a there

r324454: Disconnect libstand from the build.
---
 ObsoleteFiles.inc        |  5 +++++
 lib/Makefile             |  1 -
 share/mk/bsd.libnames.mk |  1 -
 sys/boot/Makefile        |  1 +
 sys/boot/Makefile.inc    |  2 +-
 sys/boot/libsa/Makefile  | 14 ++++++++++++++
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 sys/boot/libsa/Makefile

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d862455626ae..19478621be50 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180222: Remove libstand
+OLD_FILES+=usr/lib/libstand.a
+OLD_FILES+=usr/lib/libstand_p.a
+OLD_FILES+=usr/include/stand.h
+OLD_FILES+=usr/share/man/man3/libstand.3
 # 20180202: Convert geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
diff --git a/lib/Makefile b/lib/Makefile
index 42ed4763d18a..91a88e9092ed 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -98,7 +98,6 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	${_libsmdb} \
 	${_libsmutil} \
 	libsqlite3 \
-	libstand \
 	libstdbuf \
 	libstdthreads \
 	libsysdecode \
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index c0b2ce41b526..28be8435f8b5 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -138,7 +138,6 @@ LIBSDP?=	${DESTDIR}${LIBDIR_BASE}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR_BASE}/libsmb.a
 LIBSSL?=	${DESTDIR}${LIBDIR_BASE}/libssl.a
 LIBSSP_NONSHARED?=	${DESTDIR}${LIBDIR_BASE}/libssp_nonshared.a
-LIBSTAND?=	${DESTDIR}${LIBDIR_BASE}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR_BASE}/libstdc++.a
 LIBSTDTHREADS?=	${DESTDIR}${LIBDIR_BASE}/libstdthreads.a
 LIBSYSDECODE?=	${DESTDIR}${LIBDIR_BASE}/libsysdecode.a
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 260765126440..30baed2313aa 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+SUBDIR+=		libsa
 .if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl
diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
index 7e6439a3748c..55d26328c282 100644
--- a/sys/boot/Makefile.inc
+++ b/sys/boot/Makefile.inc
@@ -7,7 +7,7 @@ __BOOT_MAKEFILE_INC__=${MFILE}
 
 SASRC=${SRCTOP}/lib/libstand
 # Normal stand alone library
-LIBSA=${OBJTOP}/lib/libstand/libstand.a
+LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a
 # stand alone library compiled for 32-bit version of the processor
 LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a
 # stand along library compiled for userboot
diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile
new file mode 100644
index 000000000000..5b7397936c10
--- /dev/null
+++ b/sys/boot/libsa/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+.include "../Makefile.inc"
+
+LIBSTAND_SRC=	${SASRC}
+LIBC_SRC=	${SRCTOP}/lib/libc
+INTERNALLIB=
+INCS=
+MAN=
+.PATH:	${SASRC}
+
+.include "${SASRC}/Makefile"
-- 
cgit v1.2.3