hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-21 10:41:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

HBSD: Resolve merge conflicts

Browse Source 
Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
Shawn Webb 2024-11-13 14:17:32 -07:00
parent 9d70082750
commit 65d0f51a24
No known key found for this signature in database
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/conf/kern.mk
View File

@ -244,10 +244,10 @@ CFLAGS+= ${KERN_SSP_CFLAG}
CFLAGS+= -mretpoline
.endif
<<<<<<< HEAD
.if !defined(TRIVIAL_VAR_AUTO_INIT_ZERO_SAFE)
CFLAGS+= -ftrivial-auto-var-init=uninitialized
=======
.endif
#
# Kernel Address SANitizer support
#
@ -328,21 +328,6 @@ SAN_CFLAGS+= -fsanitize-coverage=trace-pc
# Add the sanitizer C flags
CFLAGS+= ${SAN_CFLAGS}
#
# Initialize stack variables on function entry
#
.if ${OPT_INIT_ALL} != "none"
.if ${COMPILER_FEATURES:Minit-all}
CFLAGS+= -ftrivial-auto-var-init=${OPT_INIT_ALL}
.if ${OPT_INIT_ALL} == "zero" && ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000
CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
.endif
.else
.warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler
.endif
>>>>>>> internal/freebsd/current/main
.endif
#
# Some newer toolchains default to DWARF 5, which isn't supported by some build
# tools yet.

7
sys/modules/vmm/Makefile
View File

@ -20,11 +20,8 @@ SRCS+= vmm.c \
vmm_stat.c
.if ${MACHINE_CPUARCH} == "aarch64"
<<<<<<< HEAD
KERN_SSP_CFLAG= -fstack-protector
=======
CFLAGS+= -I${SRCTOP}/sys/${MACHINE}/vmm/io
>>>>>>> internal/freebsd/current/main
DPSRCS+= assym.inc
# TODO: Add the new EL2 code
@ -79,13 +76,11 @@ DPSRCS+= vmx_genassym.c svm_genassym.c offset.inc
CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/intel
CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/amd
<<<<<<< HEAD
TRIVIAL_VAR_AUTO_INIT_ZERO_SAFE= yes
=======
SRCS+= opt_acpi.h \
opt_bhyve_snapshot.h \
opt_ddb.h
>>>>>>> internal/freebsd/current/main
SRCS+= vmm_host.c \
vmm_ioport.c \