svn commit: r324852 - in projects/runtime-coverage: . share/man/man5 sys/boot sys/boot/i386/gptboot sys/boot/i386/gptzfsboot sys/boot/i386/libi386 sys/boot/i386/loader sys/sys
Ngie Cooper
ngie at FreeBSD.org
Sun Oct 22 07:58:30 UTC 2017
Author: ngie
Date: Sun Oct 22 07:58:28 2017
New Revision: 324852
URL: https://svnweb.freebsd.org/changeset/base/324852
Log:
MFhead at r324851
Modified:
projects/runtime-coverage/UPDATING
projects/runtime-coverage/share/man/man5/src.conf.5
projects/runtime-coverage/sys/boot/Makefile.amd64
projects/runtime-coverage/sys/boot/Makefile.i386
projects/runtime-coverage/sys/boot/defs.mk
projects/runtime-coverage/sys/boot/i386/gptboot/Makefile
projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile
projects/runtime-coverage/sys/boot/i386/libi386/Makefile
projects/runtime-coverage/sys/boot/i386/loader/Makefile
projects/runtime-coverage/sys/sys/errno.h
Directory Properties:
projects/runtime-coverage/ (props changed)
Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/UPDATING Sun Oct 22 07:58:28 2017 (r324852)
@@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20171021:
+ As part of the boot loader infrastructure cleanup, LOADER_*_SUPPORT
+ options are changing from controlling the build if defined / undefined
+ to controlling the build with explicit 'yes' or 'no' values. They will
+ shift to WITH/WITHOUT options to match other options in the system.
+
20171010:
libstand has turned into a private library for sys/boot use only.
It is no longer supported as a public interface outside of sys/boot.
Modified: projects/runtime-coverage/share/man/man5/src.conf.5
==============================================================================
--- projects/runtime-coverage/share/man/man5/src.conf.5 Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/share/man/man5/src.conf.5 Sun Oct 22 07:58:28 2017 (r324852)
@@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
.\" $FreeBSD$
-.Dd October 06, 2017
+.Dd October 10, 2017
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -162,7 +162,7 @@ Set to build and install binutils (as, ld, objcopy, an
of the normal system build.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_BINUTILS_BOOTSTRAP
Set to not build binutils (as, ld, objcopy and objdump)
as part of the bootstrap process.
@@ -178,7 +178,7 @@ Set build binutils (as, ld, objcopy and objdump)
as part of the bootstrap process.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_BLACKLIST
Set this if you do not want to build
.Xr blacklistd 8
@@ -220,11 +220,6 @@ Set to not build the BSD licensed version of cpio base
.Xr libarchive 3 .
.It Va WITH_BSD_GREP
Install BSD-licensed grep as '[ef]grep' instead of GNU grep.
-.It Va WITHOUT_BSD_GREP_FASTMATCH
-Set this option to exclude the fastmatch implementation from
-.Xr bsdgrep 1 ,
-instead using only
-.Xr regex 3 .
.It Va WITHOUT_BSNMP
Set to not build or install
.Xr bsnmpd 1
@@ -325,7 +320,7 @@ When set, it enforces these options:
Set to build the Clang C/C++ compiler during the normal phase of the build.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
.It Va WITHOUT_CLANG_BOOTSTRAP
Set to not build the Clang C/C++ compiler during the bootstrap phase of
the build.
@@ -338,7 +333,7 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi
Set to build the Clang C/C++ compiler during the bootstrap phase of the build.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386.
.It Va WITH_CLANG_EXTRAS
Set to build additional clang and llvm tools, such as bugpoint.
.It Va WITHOUT_CLANG_FULL
@@ -352,7 +347,7 @@ Set to build the ARCMigrate, Rewriter and StaticAnalyz
Clang C/C++ compiler.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
.It Va WITHOUT_CLANG_IS_CC
Set to install the GCC compiler as
.Pa /usr/bin/cc ,
@@ -370,7 +365,7 @@ and
.Pa /usr/bin/cpp .
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386.
.It Va WITHOUT_CPP
Set to not build
.Xr cpp 1 .
@@ -437,7 +432,7 @@ Set to not build
.Xr cxgbetool 8
.Pp
This is a default setting on
-arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
+arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
.It Va WITH_CXGBETOOL
Set to build
.Xr cxgbetool 8
@@ -479,7 +474,7 @@ Set to build
and related libraries.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_DEBUG_FILES
Set to avoid building or installing standalone debug files for each
executable binary and shared library.
@@ -624,7 +619,7 @@ and
.Xr efivar 8 .
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386.
.It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
Set to not build ELF Tool Chain tools
(addr2line, nm, size, strings and strip)
@@ -680,7 +675,7 @@ Set to not build games.
Set to not build and install gcc and g++ as part of the normal build process.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
.It Va WITH_GCC
Set to build and install gcc and g++.
.Pp
@@ -693,7 +688,7 @@ unless an alternative compiler is provided via
XCC.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
.It Va WITH_GCC_BOOTSTRAP
Set to build gcc and g++ as part of the bootstrap process.
.Pp
@@ -714,7 +709,7 @@ Set to build
.Xr gdb 1 .
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_GDB_LIBEXEC
Set to install
.Xr gdb 1
@@ -722,7 +717,7 @@ into
.Pa /usr/bin .
.Pp
This is a default setting on
-arm/arm, arm/armeb, arm/armv6 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, arm/armv7 and sparc64/sparc64.
.It Va WITH_GDB_LIBEXEC
Set to install
.Xr gdb 1
@@ -741,7 +736,7 @@ Do not build the GNU C++ stack (g++, libstdc++).
This is the default on platforms where clang is the system compiler.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, riscv/riscv64 and riscv/riscv64sf.
.It Va WITH_GNUCXX
Build the GNU C++ stack (g++, libstdc++).
This is the default on platforms where gcc is the system compiler.
@@ -769,7 +764,7 @@ Set to build the BSD licensed version of the device tr
than the GPLed one from elinux.org.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
.It Va WITH_GPL_DTC
Set to build the GPL'd version of the device tree compiler from elinux.org,
instead of the BSD licensed one.
@@ -962,12 +957,12 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi
Set to build LLVM's lld linker.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64 and i386/i386.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386.
.It Va WITHOUT_LLDB
Set to not build the LLDB debugger.
.Pp
This is a default setting on
-arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
.It Va WITH_LLDB
Set to build the LLDB debugger.
.Pp
@@ -980,7 +975,7 @@ To be able to build the system, either Binutils or LLD
enabled unless an alternate linker is provided via XLD.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
.It Va WITH_LLD_BOOTSTRAP
Set to build the LLD linker during the bootstrap phase of the build.
.Pp
@@ -990,7 +985,7 @@ arm64/aarch64.
Set to use GNU binutils ld as the system linker, instead of LLVM's LLD.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
.It Va WITH_LLD_IS_LD
Set to use LLVM's LLD as the system linker, instead of GNU binutils ld.
.Pp
@@ -1000,7 +995,7 @@ arm64/aarch64.
Set to use GCC's stack unwinder (instead of LLVM's libunwind).
.Pp
This is a default setting on
-arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITH_LLVM_LIBUNWIND
Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder).
.Pp
@@ -1269,7 +1264,7 @@ Set to build profiled libraries for use with
.Xr gprof 8 .
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mipsn32, mips/mipselhf, mips/mipshf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mipsn32, mips/mipselhf, mips/mipshf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
.It Va WITHOUT_QUOTAS
Set to not build
.Xr quota 1
@@ -1353,7 +1348,7 @@ mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mi
Set to build world with propolice stack smashing protection.
.Pp
This is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
.It Va WITH_STAGING
Enable staging of files to a stage tree.
This can be best thought of as auto-install to
Modified: projects/runtime-coverage/sys/boot/Makefile.amd64
==============================================================================
--- projects/runtime-coverage/sys/boot/Makefile.amd64 Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/Makefile.amd64 Sun Oct 22 07:58:28 2017 (r324852)
@@ -5,7 +5,7 @@ SUBDIR+= libsa32
SUBDIR+= zfs
SUBDIR+= userboot
-.if !defined(LOADER_NO_GELI_SUPPORT)
+.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
SUBDIR+= geli
.endif
Modified: projects/runtime-coverage/sys/boot/Makefile.i386
==============================================================================
--- projects/runtime-coverage/sys/boot/Makefile.i386 Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/Makefile.i386 Sun Oct 22 07:58:28 2017 (r324852)
@@ -4,6 +4,6 @@ SUBDIR+= efi
SUBDIR+= libsa32
SUBDIR+= zfs
-.if !defined(LOADER_NO_GELI_SUPPORT)
+.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
SUBDIR+= geli
.endif
Modified: projects/runtime-coverage/sys/boot/defs.mk
==============================================================================
--- projects/runtime-coverage/sys/boot/defs.mk Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/defs.mk Sun Oct 22 07:58:28 2017 (r324852)
@@ -6,18 +6,24 @@
__BOOT_DEFS_MK__=${MFILE}
BOOTDIR= ${SRCTOP}/sys/boot
-FICLDIR= ${SRCTOP}/sys/boot/ficl
+FICLDIR= ${BOOTDIR}/ficl
LDR_MI= ${BOOTDIR}/common
-SASRC= ${SRCTOP}/sys/boot/libsa
+SASRC= ${BOOTDIR}/libsa
SYSDIR= ${SRCTOP}/sys
+BOOTOBJ= ${OBJTOP}/sys/boot
+
# NB: The makefiles depend on these being empty when we don't build forth.
.if ${MK_FORTH} != "no"
-LIBFICL= ${OBJTOP}/sys/boot/ficl/libficl.a
-LIBFICL32= ${OBJTOP}/sys/boot/ficl32/libficl.a
+LIBFICL= ${BOOTOBJ}/ficl/libficl.a
+LIBFICL32= ${BOOTOBJ}/ficl32/libficl.a
.endif
-LIBSA= ${OBJTOP}/sys/boot/libsa/libsa.a
-LIBSA32= ${OBJTOP}/sys/boot/libsa32/libsa32.a
+LIBSA= ${BOOTOBJ}/libsa/libsa.a
+.if ${MACHINE} == "i386"
+LIBSA32= ${LIBSA}
+.else
+LIBSA32= ${BOOTOBJ}/libsa32/libsa32.a
+.endif
# Standard options:
Modified: projects/runtime-coverage/sys/boot/i386/gptboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Sun Oct 22 07:58:28 2017 (r324852)
@@ -41,11 +41,11 @@ CFLAGS+=-DBOOTPROG=\"gptboot\" \
CFLAGS.gcc+= --param max-inline-insns-single=100
-.if !defined(LOADER_NO_GELI_SUPPORT)
+.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
CFLAGS+= -DLOADER_GELI_SUPPORT
-CFLAGS+= -I${.CURDIR}/../../geli
+CFLAGS+= -I${BOOTDIR}/geli
CFLAGS+= -I${.CURDIR}/../../..
-LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a
+LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a
.PATH: ${.CURDIR}/../../../opencrypto
OPENCRYPTO_XTS= xform_aes_xts.o
.endif
Modified: projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 07:58:28 2017 (r324852)
@@ -48,10 +48,10 @@ CFLAGS+= -Wno-tentative-definition-incomplete-type
# Do not unroll skein loops, reduce code size
CFLAGS+= -DSKEIN_LOOP=111
-.if !defined(LOADER_NO_GELI_SUPPORT)
+.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
CFLAGS+= -DLOADER_GELI_SUPPORT
-CFLAGS+= -I${.CURDIR}/../../geli
-LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a
+CFLAGS+= -I${BOOTDIR}/geli
+LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a
.PATH: ${.CURDIR}/../../../opencrypto
OPENCRYPTO_XTS= xform_aes_xts.o
.endif
Modified: projects/runtime-coverage/sys/boot/i386/libi386/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/libi386/Makefile Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/i386/libi386/Makefile Sun Oct 22 07:58:28 2017 (r324852)
@@ -25,10 +25,10 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
CFLAGS+= -DDISK_DEBUG
.endif
-.if !defined(LOADER_NO_GELI_SUPPORT)
+.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
# Decrypt encrypted drives
CFLAGS+= -DLOADER_GELI_SUPPORT
-CFLAGS+= -I${.CURDIR}/../../geli
+CFLAGS+= -I${BOOTDIR}/geli
.endif
.if !defined(BOOT_HIDE_SERIAL_NUMBERS)
Modified: projects/runtime-coverage/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/loader/Makefile Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/boot/i386/loader/Makefile Sun Oct 22 07:58:28 2017 (r324852)
@@ -43,8 +43,8 @@ HAVE_ISABUS= yes
.if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
CFLAGS+= -DLOADER_GELI_SUPPORT
-CFLAGS+= -I${.CURDIR}/../../geli
-LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a
+CFLAGS+= -I${BOOTDIR}/geli
+LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a
.PATH: ${.CURDIR}/../../../opencrypto
SRCS+= xform_aes_xts.c
CFLAGS+= -I${.CURDIR}/../../.. -D_STAND
Modified: projects/runtime-coverage/sys/sys/errno.h
==============================================================================
--- projects/runtime-coverage/sys/sys/errno.h Sun Oct 22 07:36:28 2017 (r324851)
+++ projects/runtime-coverage/sys/sys/errno.h Sun Oct 22 07:58:28 2017 (r324852)
@@ -38,7 +38,7 @@
#ifndef _SYS_ERRNO_H_
#define _SYS_ERRNO_H_
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STAND)
#include <sys/cdefs.h>
__BEGIN_DECLS
int * __error(void);
More information about the svn-src-projects
mailing list