From 10b921681108b333d17d8438a45afe6fbc1169dd Mon Sep 17 00:00:00 2001 From: Jeremy Drake via Cygwin-patches Date: Tue, 28 May 2024 10:19:22 -0700 Subject: Cygwin: disable high-entropy VA for ldh If ldd is run against a DLL which links to the Cygwin DLL, ldh will end up loading the Cygwin DLL dynamically, much like cygcheck or strace. Addresses: https://cygwin.com/pipermail/cygwin/2024-May/255991.html Fixes: 60675f1a7eb2 ("Cygwin: decouple shared mem regions from Cygwin DLL") Reviewed-by: Ken Brown , Takashi Yano Signed-off-by: Jeremy Drake --- winsup/cygwin/release/3.5.4 | 3 +++ winsup/utils/mingw/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/winsup/cygwin/release/3.5.4 b/winsup/cygwin/release/3.5.4 index 257e012..2a5f2b1 100644 --- a/winsup/cygwin/release/3.5.4 +++ b/winsup/cygwin/release/3.5.4 @@ -12,3 +12,6 @@ Fixes: - Fix regression of pthread::once() introduced in 3.5.0 (i.e., the race issue regarding destroying mutex). Addresses: https://cygwin.com/pipermail/cygwin/2024-May/255987.html + +- Fix a problem that ldd command against cygwin DLLs sometimes hangs. + Addresses: https://cygwin.com/pipermail/cygwin/2024-May/255991.html diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am index d9557d8..7f7317a 100644 --- a/winsup/utils/mingw/Makefile.am +++ b/winsup/utils/mingw/Makefile.am @@ -38,6 +38,7 @@ cygcheck_LDADD = -lz -lwininet -lshlwapi -lpsapi -lntdll cygwin_console_helper_SOURCES = cygwin-console-helper.cc ldh_SOURCES = ldh.cc +ldh_LDFLAGS = ${AM_LDFLAGS} -Wl,--disable-high-entropy-va strace_SOURCES = \ path.cc \ -- cgit v1.1