Page MenuHomeFreeBSD

D43239.id132183.diff
No OneTemporary

D43239.id132183.diff

diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -205,7 +205,7 @@
*/
tf_addr = *fp + 16;
- if (!__is_aligned(tf_addr, _Alignof(*tf)) || !INKERNEL(tf_addr)) {
+ if (!__is_aligned(tf_addr, _Alignof(struct trapframe)) || !INKERNEL(tf_addr)) {
db_printf("--- invalid trapframe %p\n", (void *)tf_addr);
*ip = 0;
*fp = 0;
diff --git a/sys/arm64/arm64/db_trace.c b/sys/arm64/arm64/db_trace.c
--- a/sys/arm64/arm64/db_trace.c
+++ b/sys/arm64/arm64/db_trace.c
@@ -92,7 +92,7 @@
struct trapframe *tf;
tf = (struct trapframe *)(uintptr_t)frame->fp - 1;
- if (!__is_aligned(tf, _Alignof(*tf)) ||
+ if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
!kstack_contains(td, (vm_offset_t)tf,
sizeof(*tf))) {
db_printf("--- invalid trapframe %p\n", tf);
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -274,7 +274,7 @@
.PHONY: ${PHONY_NOTMAIN}
.NOTMAIN: ${PHONY_NOTMAIN}
-CSTD?= gnu99
+CSTD?= gnu17
.if ${CSTD} == "k&r"
CFLAGS+= -traditional
diff --git a/sys/contrib/zstd/lib/freebsd/assert.h b/sys/contrib/zstd/lib/freebsd/assert.h
new file mode 100644
--- /dev/null
+++ b/sys/contrib/zstd/lib/freebsd/assert.h
@@ -0,0 +1,4 @@
+/* This file is in the public domain */
+#include <sys/cdefs.h>
+
+#define static_assert _Static_assert
diff --git a/sys/riscv/riscv/db_trace.c b/sys/riscv/riscv/db_trace.c
--- a/sys/riscv/riscv/db_trace.c
+++ b/sys/riscv/riscv/db_trace.c
@@ -83,7 +83,7 @@
struct trapframe *tf;
tf = (struct trapframe *)(uintptr_t)frame->sp;
- if (!__is_aligned(tf, _Alignof(*tf)) ||
+ if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
!kstack_contains(td, (vm_offset_t)tf,
sizeof(*tf))) {
db_printf("--- invalid trapframe %p\n", tf);

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 4:43 AM (15 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24082632
Default Alt Text
D43239.id132183.diff (1 KB)

Event Timeline