Skip to content

Commit

Permalink
Install unwind.h into /usr/include
Browse files Browse the repository at this point in the history 
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

(cherry picked from commit c00d345)
  • Loading branch information
@bsdjhb @DimitryAndric
bsdjhb authored and DimitryAndric committed Feb 20, 2022
1 parent 62d39fb commit b2127b6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 168 deletions.
5 changes: 5 additions & 0 deletions ObsoleteFiles.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
# xargs -n1 | sort | uniq -d;
# done

# 20220220: unwind.h moved to /usr/include
OLD_FILES+=usr/include/c++/v1/unwind-arm.h
OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
OLD_FILES+=usr/include/c++/v1/unwind.h

# 20211221 efi_set_variables_supported.3 should be efi_variables_supported.3
OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz

Expand Down
160 changes: 0 additions & 160 deletions include/unwind.h
View file

This file was deleted.

3 changes: 0 additions & 3 deletions lib/libc++/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,6 @@ STD+= ${HDRDIR}/${hdr}
STD+= ${.CURDIR}/__config_site

RT_HEADERS+= cxxabi.h
RT_HEADERS+= unwind-arm.h
RT_HEADERS+= unwind-itanium.h
RT_HEADERS+= unwind.h
.for hdr in ${RT_HEADERS}
STD+= ${_LIBCXXRTDIR}/${hdr}
.endfor
Expand Down
4 changes: 4 additions & 0 deletions lib/libgcc_eh/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ WARNS?= 2
SRCS_EXC+= int_util.c
.include "Makefile.inc"

INCS+= ${UNWINDINCDIR}/__libunwind_config.h
INCS+= ${UNWINDINCDIR}/libunwind.h
INCS+= ${UNWINDINCDIR}/unwind.h

.if ${.MAKE.LEVEL} > 0
# avoid circular dependencies
GENDIRDEPS_FILTER+= Nlib/msun
Expand Down
1 change: 0 additions & 1 deletion lib/libgcc_eh/Makefile.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
.endfor

CFLAGS+= -I${UNWINDINCDIR}
CFLAGS+= -I${.CURDIR}
CFLAGS+= -D_LIBUNWIND_IS_NATIVE_ONLY
CFLAGS+= -D_LIBUNWIND_USE_FRAME_HEADER_CACHE
CXXFLAGS+= -fno-rtti
Expand Down
1 change: 0 additions & 1 deletion lib/libthr/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${SRCTOP}/lib/libc/include
CFLAGS+=-I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
CFLAGS+=-I${.CURDIR}/thread
CFLAGS+=-I${SRCTOP}/include
CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
CFLAGS+=-I${.CURDIR}/sys
CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
Expand Down
3 changes: 0 additions & 3 deletions tools/build/mk/OptionalObsoleteFiles.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4189,9 +4189,6 @@ OLD_FILES+=usr/include/c++/v1/typeindex
OLD_FILES+=usr/include/c++/v1/typeinfo
OLD_FILES+=usr/include/c++/v1/unordered_map
OLD_FILES+=usr/include/c++/v1/unordered_set
OLD_FILES+=usr/include/c++/v1/unwind-arm.h
OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
OLD_FILES+=usr/include/c++/v1/unwind.h
OLD_FILES+=usr/include/c++/v1/utility
OLD_FILES+=usr/include/c++/v1/valarray
OLD_FILES+=usr/include/c++/v1/variant
Expand Down

0 comments on commit b2127b6

Please sign in to comment.