diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2022-02-10 17:57:49 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-02-20 12:29:44 +0000 |
| commit | b2127b6f1ae2b92eba1892e6f5257e3f6795fed5 (patch) | |
| tree | 81053acb225972fca9a3673f87b375670a052c34 /lib | |
| parent | 62d39fb7c099821fc6f7c3ab1407d71c829c59a6 (diff) | |
| download | src-b2127b6f1ae2b92eba1892e6f5257e3f6795fed5.tar.gz src-b2127b6f1ae2b92eba1892e6f5257e3f6795fed5.zip | |
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
(cherry picked from commit c00d345665366a89aaba7244d6f078dc756f4c53)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc++/Makefile | 3 | ||||
| -rw-r--r-- | lib/libgcc_eh/Makefile | 4 | ||||
| -rw-r--r-- | lib/libgcc_eh/Makefile.inc | 1 | ||||
| -rw-r--r-- | lib/libthr/Makefile | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 2bc1bf40eccd..6c00aa398ee0 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -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 diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile index ecffbf9cfd6a..6f2deda1adf0 100644 --- a/lib/libgcc_eh/Makefile +++ b/lib/libgcc_eh/Makefile @@ -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 diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 4fe1eff406e1..20535a5d0bbc 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -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 diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 1a5dfa18dca7..fab83d98ebe0 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -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 |