* ldd.cc (load_dll): Start helper program rather than ldd.exe.

(set_entry_point_break): Rename from get_entry_point.
(print_dlls): Rename from print_dlls_and_kill_inferior.  Avoid printing
specific dll name if we're looking at a dll.
(report): Always dump dlls on process exit.  Don't allow thread creation.
Accommodate get_entry_point rename.
(start_process): Start process with DEBUG_ONLY_THIS_PROCESS.
(longopts): Eliminate "dll" option.
(main): Ditto.
* ldd.cc: Use wide character Win32 paths throughout.
(load_dll): Fix size expression (add fn) in realloc.

1 files changed, 5 insertions, 2 deletions

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index d4c5309eb..bf5905f9a 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -57,12 +57,12 @@ CYGWIN_BINS := ${addsuffix .exe,cygpath getfacl ldd kill mkgroup \
 
 # List all binaries to be linked in MinGW mode.  Each binary on this list
 # must have a corresponding .o of the same name.
-MINGW_BINS := ${addsuffix .exe,strace cygcheck}
+MINGW_BINS := ${addsuffix .exe,cygcheck ldh strace}
 
 # List all objects to be compiled in MinGW mode.  Any object not on this
 # list will will be compiled in Cygwin mode implicitly, so there is no
 # need for a CYGWIN_OBJS.
-MINGW_OBJS := bloda.o cygcheck.o dump_setup.o path.o strace.o
+MINGW_OBJS := bloda.o cygcheck.o dump_setup.o ldh.o path.o strace.o
 
 # If a binary should link in any objects besides the .o with the same
 # name as the binary, then list those here.
@@ -75,6 +75,9 @@ cygpath.exe: ALL_LDFLAGS += -lntdll
 
 ldd.exe: ALL_LDFLAGS += -lpsapi
 
+ldh.exe: MINGW_LDLIBS :=
+ldh.exe: MINGW_LDFLAGS := -nostdlib -lkernel32
+
 # Check for dumper's requirements and enable it if found.
 LIBICONV := @libiconv@
 libbfd   := ${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}