From f3ad60380e2c750c9050bd1b31571155c44138d0 Mon Sep 17 00:00:00 2001
From: Shawn Webb <shawn.webb@hardenedbsd.org>
Date: Tue, 12 Nov 2024 12:47:00 -0700
Subject: [PATCH] HBSD: Resolve merge conflicts

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
---
 lib/libclang_rt/Makefile.inc            | 4 ----
 lib/libprocstat/Makefile                | 7 -------
 share/mk/bsd.opts.mk                    | 5 -----
 stand/defs.mk                           | 4 ----
 targets/pseudo/bootstrap-tools/Makefile | 5 -----
 5 files changed, 25 deletions(-)

diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 8c5712191046..8b40e797d5b4 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -10,11 +10,7 @@ LIBDIR=		${SANITIZER_LIBDIR}
 SHLIBDIR=	${LIBDIR}
 
 NO_PIC=
-<<<<<<< HEAD
-MK_PROFILE=	no
 MK_LTOLIB=	no
-=======
->>>>>>> internal/freebsd/current/main
 MK_ASAN:=	no
 MK_SSP=		no
 MK_UBSAN:=	no
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index 12c7e8259ac4..e14eebbf2310 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -62,13 +62,6 @@ zfs/zfs_defs.o: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o
 zfs/zfs_defs.pico: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico
-<<<<<<< HEAD
-zfs/zfs_defs.po: .PHONY
-	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.po
-=======
-zfs/zfs_defs.pieo: .PHONY
-	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pieo
->>>>>>> internal/freebsd/current/main
 .endif
 
 .include <bsd.lib.mk>
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 862fc1736f68..1e4ab50a8fae 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -76,11 +76,6 @@ __DEFAULT_NO_OPTIONS = \
     CCACHE_BUILD \
     CTF \
     INSTALL_AS_USER \
-<<<<<<< HEAD
-    PROFILE \
-=======
-    RETPOLINE \
->>>>>>> internal/freebsd/current/main
     STALE_STAGED \
     UBSAN \
     UNDEFINED_VERSION
diff --git a/stand/defs.mk b/stand/defs.mk
index 7470604fd90c..004977c785e1 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -10,12 +10,8 @@ FORTIFY_SOURCE=	0
 
 MK_CTF=		no
 MK_SSP=		no
-<<<<<<< HEAD
-MK_PROFILE=	no
 MK_SPECTREV1_FIX=	no
 MK_LTOLIB=		no
-=======
->>>>>>> internal/freebsd/current/main
 MK_PIE=		no
 MAN=
 .if !defined(PIC)
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index 6692ef473b8d..fd660fce026c 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -47,11 +47,6 @@ BSARGS= 	DESTDIR= \
 		MK_CLANG_FULL=no \
 		MK_HTML=no \
 		MK_MAN=no \
-<<<<<<< HEAD
-		MK_PROFILE=no \
-=======
-		MK_RETPOLINE=no \
->>>>>>> internal/freebsd/current/main
 		MK_SSP=no \
 		MK_TESTS=no \
 		MK_WERROR=no \