After r364423, which ensures the callbacks that dl_iterate_phdr(3)

performs are protected by an exclusive lock, even for statically linked
programs, it is safe to re-enable libunwind's FrameHeaderCache, which I
temporarily disabled in r364263.

Meanwhile upstream has also used the _LIBUNWIND_USE_FRAME_HEADER_CACHE
for this purpose, so the only thing needed is to add this as a
compile-time command line flag.

While here, reformat the CFLAGS lines a little bit.

MFC after:	6 weeks
X-MFC-With:	r364284, r364423
This commit is contained in:
dim 2020-08-25 20:07:11 +00:00
parent a07a8c4375
commit f2f9731d54

View File

@ -25,7 +25,10 @@ CFLAGS.${file}+= -fno-exceptions -funwind-tables
CXXFLAGS.${file}+= -fno-exceptions -funwind-tables CXXFLAGS.${file}+= -fno-exceptions -funwind-tables
.endfor .endfor
CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY CFLAGS+= -I${UNWINDINCDIR}
CFLAGS+= -I${.CURDIR}
CFLAGS+= -D_LIBUNWIND_IS_NATIVE_ONLY
CFLAGS+= -D_LIBUNWIND_USE_FRAME_HEADER_CACHE
CXXFLAGS+= -fno-rtti CXXFLAGS+= -fno-rtti
CXXSTD?= c++11 CXXSTD?= c++11
STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC