From cc0b8830287282c96e26cd826383dc4794eb1268 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 25 Aug 2020 20:07:11 +0000 Subject: [PATCH] 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 --- lib/libgcc_eh/Makefile.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 6e025921180a..4fe1eff406e1 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -25,7 +25,10 @@ CFLAGS.${file}+= -fno-exceptions -funwind-tables CXXFLAGS.${file}+= -fno-exceptions -funwind-tables .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 CXXSTD?= c++11 STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC