Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Nov 2017 03:07:58 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
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
Message-ID:  <201711040307.vA437w5n005166@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711040307.vA437w5n005166>