From 4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 9 Mar 2022 22:23:35 +0100
Subject: [PATCH] Build compiler-rt against libunwind, not libcxxrt

Parts of compiler-rt are also built for libgcc_eh and libgcc_s, and
these were already pointing to the libunwind unwind.h. For the sake of
consistency, also build compiler-rt itself against the libunwind
unwind.h, not the libcxxrt one.

MFC after:	3 days

(cherry picked from commit 7ecd99fa424df001028c5cddc52d25b29232f1af)
---
 lib/libcompiler_rt/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index b23522b7e41..0e9f58cc3fc 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -11,7 +11,7 @@ WARNS?=		2
 CFLAGS+=	${PICFLAG}
 CFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-DVISIBILITY_HIDDEN
-CFLAGS+=	-I${SRCTOP}/contrib/libcxxrt
+CFLAGS+=	-I${SRCTOP}/contrib/llvm-project/libunwind/include
 
 # gcc has incompatible internal declarations for __divtc3 and __multc3, but has
 # no option to silence its warning, so make warnings non-fatal.