From owner-svn-src-head@freebsd.org  Sat Nov  4 03:07:59 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A07C1E625F2;
 Sat,  4 Nov 2017 03:07:59 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A87381EF1;
 Sat,  4 Nov 2017 03:07:59 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA437wJk005169;
 Sat, 4 Nov 2017 03:07:58 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA437w5n005166;
 Sat, 4 Nov 2017 03:07:58 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711040307.vA437w5n005166@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 4 Nov 2017 03:07:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325379 - in head/sys/boot: . libsa libsa32
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys/boot: . libsa libsa32
X-SVN-Commit-Revision: 325379
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Nov 2017 03:07:59 -0000

Author: imp
Date: Sat Nov  4 03:07:58 2017
New Revision: 325379
URL: https://svnweb.freebsd.org/changeset/base/325379

Log:
  Revert "mostly libsa"
  
  This reverts accidentally pushed r325377.

Modified:
  head/sys/boot/defs.mk
  head/sys/boot/libsa/Makefile
  head/sys/boot/libsa32/Makefile

Modified: head/sys/boot/defs.mk
==============================================================================
--- head/sys/boot/defs.mk	Sat Nov  4 03:01:58 2017	(r325378)
+++ head/sys/boot/defs.mk	Sat Nov  4 03:07:58 2017	(r325379)
@@ -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"

Modified: head/sys/boot/libsa/Makefile
==============================================================================
--- head/sys/boot/libsa/Makefile	Sat Nov  4 03:01:58 2017	(r325378)
+++ head/sys/boot/libsa/Makefile	Sat Nov  4 03:07:58 2017	(r325379)
@@ -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

Modified: head/sys/boot/libsa32/Makefile
==============================================================================
--- head/sys/boot/libsa32/Makefile	Sat Nov  4 03:01:58 2017	(r325378)
+++ head/sys/boot/libsa32/Makefile	Sat Nov  4 03:07:58 2017	(r325379)
@@ -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"