Commit 68abece3 authored by Oliver Pinter +'s avatar Oliver Pinter +
Browse files

Merge remote-tracking branch 'freebsd/master' into hardened/current/master

parents 901d0cee fd2e5cc5
......@@ -1493,8 +1493,6 @@ _btxld= usr.sbin/btxld
.if ${XAS:M/*} == ""
.if ${MK_BINUTILS_BOOTSTRAP} != "no"
_binutils= gnu/usr.bin/binutils
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
_elftctools= lib/libelftc \
usr.bin/elfcopy \
usr.bin/nm \
......@@ -1504,7 +1502,7 @@ _elftctools= lib/libelftc \
# cross-build on a FreeBSD 10 host:
_elftctools+= usr.bin/addr2line
.endif
.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_BINUTILS_BOOTSTRAP} != "no"
# If cross-building with an external binutils we still need to build strip for
# the target (for at least crunchide).
_elftctools= lib/libelftc \
......
......@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20150813:
The WITHOUT_ELFTOOLCHAIN_TOOLS src.conf(5) knob has been retired.
Control over building the ELF Tool Chain tools is now provided by
the WITHOUT_TOOLCHAIN knob.
20150810:
The polarity of Pulse Per Second (PPS) capture events with the
uart(4) driver has been corrected. Prior to this change the PPS
......
......@@ -5908,6 +5908,7 @@ ztest_init(ztest_shared_t *zs)
}
VERIFY3U(0, ==, spa_create(ztest_opts.zo_pool, nvroot, props, NULL));
nvlist_free(nvroot);
nvlist_free(props);
VERIFY3U(0, ==, spa_open(ztest_opts.zo_pool, &spa, FTAG));
zs->zs_metaslab_sz =
......
......@@ -12,7 +12,7 @@ SUBDIR= doc\
${_objcopy} \
objdump \
.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" || ${MK_ELFCOPY_AS_OBJCOPY} == "no"
.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
_objcopy= objcopy
.endif
......
......@@ -182,7 +182,7 @@ _clang= clang
_cuse= libcuse
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
.if ${MK_TOOLCHAIN} != "no"
_libelftc= libelftc
.endif
......
......@@ -57,10 +57,10 @@ of 42 nanoseconds.
.Pp
To use the PPS timing information provided by this driver with
.Xr ntpd 8 ,
symlink the
.Va /dev/dmtpps
symlink the
.Pa /dev/dmtpps
device to
.Va /dev/pps0
.Pa /dev/pps0
and configure server
.Va 127.127.22.0
in
......@@ -77,7 +77,7 @@ driver can be active at a time.
The driver uses system pin configuration to determine which hardware
timer device to use.
Configure the timer input pin in the system's FDT data, or by
supplying the pin name using a tunable variable in
supplying the pin name using a tunable variable in
.Xr loader.conf 5 .
.Pp
To use a standard kernel and FDT data, use
......@@ -127,7 +127,7 @@ Add pinctrl properties referencing
.Va timer4_pins
to the standard
.Va timer4
device node (also defined in am33xx.dtsi) by referencing it in
device node (also defined in am33xx.dtsi) by referencing it in
your dts file as follows:
.Bd -literal
&timer4 {
......@@ -160,4 +160,4 @@ device driver first appeared in
The
.Nm
device driver and this manual page were written by
.An Ian Lepore Aq Mt ian@freebsd.org .
.An Ian Lepore Aq Mt ian@FreeBSD.org .
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 284708 2015-06-22 20:21:57Z sjg
.\" $FreeBSD$
.Dd August 1, 2015
.Dd August 13, 2015
.Dt SRC.CONF 5
.Os
.Sh NAME
......@@ -137,9 +137,8 @@ associated utilities, and examples.
.Pp
This option only affects amd64/amd64.
.It Va WITHOUT_BINUTILS
.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 286036 2015-07-29 20:02:20Z emaste
Set to not build or install binutils (as, c++-filt,
ld, nm, objcopy, objdump, readelf, size and strip) as part
.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 286332 2015-08-05 18:30:00Z emaste
Set to not build or install binutils (as, ld, objcopy, and objdump ) as part
of the normal system build.
The resulting system cannot build programs from source.
.Pp
......@@ -457,18 +456,6 @@ instead of the one from GNU Binutils.
.Pp
It is a default setting on
arm64/aarch64.
.It Va WITHOUT_ELFTOOLCHAIN_TOOLS
.\" from FreeBSD: head/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS 286016 2015-07-29 15:42:22Z emaste
Set to use
.Xr addr2line 1 ,
.Xr c++filt 1 ,
.Xr nm 1 ,
.Xr readelf 1 ,
.Xr size 1 ,
.Xr strings 1 ,
and
.Xr strip 1
from GNU binutils instead of the ELF Tool Chain project.
.It Va WITHOUT_EXAMPLES
.\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
Set to avoid installing examples to
......
......@@ -80,7 +80,6 @@ __DEFAULT_YES_OPTIONS = \
DYNAMICROOT \
ED_CRYPTO \
EE \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
FILE \
......
......@@ -104,7 +104,7 @@ __FBSDID("$FreeBSD$");
/* Read the current thread flags */
1: ldr x1, [x18, #PC_CURTHREAD] /* Load curthread */
ldr x2, [x1, #TD_FLAGS]! /* TODO: No need for the ! but clang fails without it */
ldr x2, [x1, #TD_FLAGS]
/* Check if we have either bits set */
mov x3, #((TDF_ASTPENDING|TDF_NEEDRESCHED) >> 8)
......
......@@ -2536,9 +2536,9 @@ struct shmem2_region {
#define SHMEM_EEE_SUPPORTED_MASK 0x000f0000
#define SHMEM_EEE_SUPPORTED_SHIFT 16
#define SHMEM_EEE_ADV_STATUS_MASK 0x00f00000
#define SHMEM_EEE_100M_ADV (1<<0)
#define SHMEM_EEE_1G_ADV (1<<1)
#define SHMEM_EEE_10G_ADV (1<<2)
#define SHMEM_EEE_100M_ADV (1U<<0)
#define SHMEM_EEE_1G_ADV (1U<<1)
#define SHMEM_EEE_10G_ADV (1U<<2)
#define SHMEM_EEE_ADV_STATUS_SHIFT 20
#define SHMEM_EEE_LP_ADV_STATUS_MASK 0x0f000000
#define SHMEM_EEE_LP_ADV_STATUS_SHIFT 24
......
......@@ -1565,7 +1565,7 @@ md_preloaded(u_char *image, size_t length, const char *name)
printf("%s%d: Preloaded image <%s> %zd bytes at %p\n",
MD_NAME, sc->unit, name, length, image);
} else {
printf("%s%d: Embedded image %zd bytes as %p\n",
printf("%s%d: Embedded image %zd bytes at %p\n",
MD_NAME, sc->unit, length, image);
}
}
......
......@@ -9,7 +9,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
.endif
DIRDEPS=
.if ${MK_ELFTOOLCHAIN_TOOLS} == "yes"
.if ${MK_TOOLCHAIN} == "yes"
DIRDEPS+= \
usr.bin/addr2line \
usr.bin/cxxflit \
......
......@@ -184,7 +184,7 @@ OLD_DIRS+=usr/share/examples/bhyve
.if ${MK_BINUTILS} == no
OLD_FILES+=usr/bin/as
OLD_FILES+=usr/bin/ld
.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
.if ${MK_ELFCOPY_AS_OBJCOPY} == no
OLD_FILES+=usr/bin/objcopy
.endif
OLD_FILES+=usr/bin/objdump
......@@ -203,7 +203,7 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
OLD_FILES+=usr/share/man/man1/as.1.gz
OLD_FILES+=usr/share/man/man1/ld.1.gz
.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
.if ${MK_ELFCOPY_AS_OBJCOPY} == no
OLD_FILES+=usr/share/man/man1/objcopy.1.gz
.endif
OLD_FILES+=usr/share/man/man1/objdump.1.gz
......@@ -1647,29 +1647,6 @@ OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} == no || \
(${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} != no)
OLD_FILES+=usr/bin/elfcopy
OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} == no
OLD_FILES+=usr/bin/addr2line
OLD_FILES+=usr/bin/c++filt
OLD_FILES+=usr/bin/nm
OLD_FILES+=usr/bin/readelf
OLD_FILES+=usr/bin/size
OLD_FILES+=usr/bin/strings
OLD_FILES+=usr/bin/strip
OLD_FILES+=usr/share/man/man1/addr2line.1.gz
OLD_FILES+=usr/share/man/man1/c++filt.1.gz
OLD_FILES+=usr/share/man/man1/nm.1.gz
OLD_FILES+=usr/share/man/man1/readelf.1.gz
OLD_FILES+=usr/share/man/man1/size.1.gz
OLD_FILES+=usr/share/man/man1/strings.1.gz
OLD_FILES+=usr/share/man/man1/strip.1.gz
.endif
#.if ${MK_EXAMPLES} == no
# to be filled in
#.endif
......@@ -7530,8 +7507,25 @@ OLD_FILES+=usr/share/man/man1/ul.1.gz
.endif
#.if ${MK_TOOLCHAIN} == no
# to be filled in
OLD_FILES+=usr/bin/addr2line
OLD_FILES+=usr/bin/c++filt
OLD_FILES+=usr/bin/nm
OLD_FILES+=usr/bin/readelf
OLD_FILES+=usr/bin/size
OLD_FILES+=usr/bin/strings
OLD_FILES+=usr/bin/strip
OLD_FILES+=usr/share/man/man1/addr2line.1.gz
OLD_FILES+=usr/share/man/man1/c++filt.1.gz
OLD_FILES+=usr/share/man/man1/nm.1.gz
OLD_FILES+=usr/share/man/man1/readelf.1.gz
OLD_FILES+=usr/share/man/man1/size.1.gz
OLD_FILES+=usr/share/man/man1/strings.1.gz
OLD_FILES+=usr/share/man/man1/strip.1.gz
#.endif
.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no
OLD_FILES+=usr/bin/elfcopy
OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
.endif
.if ${MK_UNBOUND} == no
OLD_FILES+=etc/rc.d/local_unbound
......
.\" $FreeBSD$
Set to avoid building ELF Tool Chain tools
.Xr addr2line 1 ,
.Xr c++filt 1 ,
.Xr nm 1 ,
.Xr readelf 1 ,
.Xr size 1 ,
.Xr strings 1 ,
and
.Xr strip 1 .
......@@ -218,16 +218,6 @@ SUBDIR+= clang
SUBDIR+= ee
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
SUBDIR+= addr2line
SUBDIR+= cxxfilt
SUBDIR+= elfcopy
SUBDIR+= nm
SUBDIR+= readelf
SUBDIR+= size
SUBDIR+= strings
.endif
.if ${MK_FILE} != "no"
SUBDIR+= file
.endif
......@@ -361,10 +351,13 @@ SUBDIR+= tftp
.endif
.if ${MK_TOOLCHAIN} != "no"
SUBDIR+= addr2line
SUBDIR+= ar
SUBDIR+= c89
SUBDIR+= c99
SUBDIR+= ctags
SUBDIR+= cxxfilt
SUBDIR+= elfcopy
SUBDIR+= file2c
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO gprof does not build
SUBDIR+= gprof
......@@ -372,8 +365,12 @@ SUBDIR+= gprof
SUBDIR+= indent
SUBDIR+= lex
SUBDIR+= mkstr
SUBDIR+= nm
SUBDIR+= readelf
SUBDIR+= rpcgen
SUBDIR+= unifdef
SUBDIR+= size
SUBDIR+= strings
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
SUBDIR+= xlint
.endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment