Verified Commit c0a7c121 authored by Shawn Webb's avatar Shawn Webb
Browse files

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

parents 4acf0401 14ebab25
......@@ -1634,7 +1634,7 @@ https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html
20160708:
The stable/11 branch has been created from head@r302406.
After branch N is created, entriels older than the N-2 branch point are removed
After branch N is created, entries older than the N-2 branch point are removed
from this file. After stable/14 is branched and current becomes FreeBSD 15,
entries older than stable/12 branch point will be removed from current's
UPDATING file.
......
......@@ -1115,6 +1115,15 @@ dt_vopen(int version, int flags, int *errp,
*/
if (err == ENOENT && modfind("dtraceall") < 0) {
kldload("dtraceall"); /* ignore the error */
#if __SIZEOF_LONG__ == 8
if (modfind("linux64elf") >= 0)
kldload("systrace_linux");
if (modfind("linuxelf") >= 0)
kldload("systrace_linux32");
#else
if (modfind("linuxelf") >= 0)
kldload("systrace_linux");
#endif
dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
err = errno;
}
......
......@@ -26,6 +26,11 @@
# define SYS_futex SYS_futex_time64
#endif
#elif defined(__FreeBSD__)
#include <sys/types.h>
#include <sys/umtx.h>
#else // <- Add other operating systems here
// Baseline needs no new headers
......@@ -72,6 +77,22 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
const_cast<__cxx_atomic_contention_t*>(__ptr), 0);
}
#elif defined(__FreeBSD__) && defined(__LP64__)
static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
__cxx_contention_t __val)
{
_umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
UMTX_OP_WAIT, __val, NULL, NULL);
}
static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr,
bool __notify_one)
{
_umtx_op(const_cast<__cxx_atomic_contention_t*>(__ptr),
UMTX_OP_WAKE, __notify_one ? 1 : INT_MAX, NULL, NULL);
}
#else // <- Add other operating systems here
// Baseline is just a timed backoff
......
......@@ -1309,7 +1309,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
case PFCTL_SHOW_LABELS:
break;
case PFCTL_SHOW_RULES:
if (rule.label[0] && (opts & PF_OPT_SHOWALL))
if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
print_rule(&rule, anchor_call, rule_numbers, numeric);
printf("\n");
......@@ -1363,7 +1363,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
break;
}
case PFCTL_SHOW_RULES:
if (rule.label[0] && (opts & PF_OPT_SHOWALL))
if (rule.label[0][0] && (opts & PF_OPT_SHOWALL))
labels = 1;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
print_rule(&rule, anchor_call, rule_numbers, numeric);
......
......@@ -31,7 +31,7 @@
.\" @(#)find.1 8.7 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
.Dd August 2, 2022
.Dd January 23, 2023
.Dt FIND 1
.Os
.Sh NAME
......@@ -67,7 +67,7 @@ of each file in the tree.
The options are as follows:
.Bl -tag -width indent
.It Fl E
Interpret regular expressions followed by
Interpret regular expressions following the
.Ic -regex
and
.Ic -iregex
......
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