Skip to content

Commit c00d345

Browse files
bsdjhbDimitryAndric
authored andcommitted
Install unwind.h into /usr/include
Install headers from LLVM's libunwind in place of the headers from libcxxrt and allow C applications to use the library. As part of this, remove include/unwind.h and switch libthr over to using the installed unwind.h. Reviewed by: dim, emaste MFC after: 10 days Differential Revision: https://reviews.freebsd.org/D34065
1 parent 9465851 commit c00d345

File tree

7 files changed

+9
-168
lines changed

7 files changed

+9
-168
lines changed

ObsoleteFiles.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
# xargs -n1 | sort | uniq -d;
5353
# done
5454

55+
# 20220210: unwind.h moved to /usr/include
56+
OLD_FILES+=usr/include/c++/v1/unwind-arm.h
57+
OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
58+
OLD_FILES+=usr/include/c++/v1/unwind.h
59+
5560
# 20220128: mips pmc events removed
5661
OLD_FILES+=usr/share/man/man3/pmc.mips24k.3
5762
OLD_FILES+=usr/share/man/man3/pmc.octeon.3

include/unwind.h

Lines changed: 0 additions & 160 deletions
This file was deleted.

lib/libc++/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,6 @@ STD+= ${HDRDIR}/${hdr}
239239
STD+= ${.CURDIR}/__config_site
240240

241241
RT_HEADERS+= cxxabi.h
242-
RT_HEADERS+= unwind-arm.h
243-
RT_HEADERS+= unwind-itanium.h
244-
RT_HEADERS+= unwind.h
245242
.for hdr in ${RT_HEADERS}
246243
STD+= ${_LIBCXXRTDIR}/${hdr}
247244
.endfor

lib/libgcc_eh/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ WARNS?= 2
1111
SRCS_EXC+= int_util.c
1212
.include "Makefile.inc"
1313

14+
INCS+= ${UNWINDINCDIR}/__libunwind_config.h
15+
INCS+= ${UNWINDINCDIR}/libunwind.h
16+
INCS+= ${UNWINDINCDIR}/unwind.h
17+
1418
.if ${.MAKE.LEVEL} > 0
1519
# avoid circular dependencies
1620
GENDIRDEPS_FILTER+= Nlib/msun

lib/libgcc_eh/Makefile.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ CXXFLAGS.${file}+= -fno-sanitize=address
3434
.endfor
3535

3636
CFLAGS+= -I${UNWINDINCDIR}
37-
CFLAGS+= -I${.CURDIR}
3837
CFLAGS+= -D_LIBUNWIND_IS_NATIVE_ONLY
3938
CFLAGS+= -D_LIBUNWIND_USE_FRAME_HEADER_CACHE
4039
CXXFLAGS+= -fno-rtti

lib/libthr/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ CFLAGS+=-DPTHREAD_KERNEL
1919
CFLAGS+=-I${SRCTOP}/lib/libc/include
2020
CFLAGS+=-I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
2121
CFLAGS+=-I${.CURDIR}/thread
22-
CFLAGS+=-I${SRCTOP}/include
2322
CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
2423
CFLAGS+=-I${.CURDIR}/sys
2524
CFLAGS+=-I${SRCTOP}/libexec/rtld-elf

tools/build/mk/OptionalObsoleteFiles.inc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4027,9 +4027,6 @@ OLD_FILES+=usr/include/c++/v1/typeindex
40274027
OLD_FILES+=usr/include/c++/v1/typeinfo
40284028
OLD_FILES+=usr/include/c++/v1/unordered_map
40294029
OLD_FILES+=usr/include/c++/v1/unordered_set
4030-
OLD_FILES+=usr/include/c++/v1/unwind-arm.h
4031-
OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
4032-
OLD_FILES+=usr/include/c++/v1/unwind.h
40334030
OLD_FILES+=usr/include/c++/v1/utility
40344031
OLD_FILES+=usr/include/c++/v1/valarray
40354032
OLD_FILES+=usr/include/c++/v1/variant

0 commit comments

Comments
 (0)