diff options
author | Christopher Faylor <me@cgf.cx> | 2001-08-31 05:06:14 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-08-31 05:06:14 +0000 |
commit | 5835f2cf8dfb01b93c233bfb5e486482a545aded (patch) | |
tree | 1384eb71caa42c16db5ae0ad966088417bed66fa /winsup/cygwin/Makefile.in | |
parent | 33bc82476eb92308590d03407cb1597eca8b0079 (diff) | |
download | cygnal-5835f2cf8dfb01b93c233bfb5e486482a545aded.tar.gz cygnal-5835f2cf8dfb01b93c233bfb5e486482a545aded.tar.bz2 cygnal-5835f2cf8dfb01b93c233bfb5e486482a545aded.zip |
* cygwin.sc: New file -- linker script for building cygwin DLL.
* Makefile.in: Use linker script to control location of cygheap.
* cygheap.cc (buckets): Make static.
(init_cheap): Remove special iswinnt handling. Allocate cygheap at a fixed
location. Display more info when allocation fails.
(cygheap_fixup_in_child): Try harder to move cygheap to correct location.
Display more info when allocation fails.
* fhandler.h (fhandler_socket): Add macros for tracking socket shutdown state.
* net.cc (cygwin_shutdown): Set appropriate shutdown value for future use.
* select.cc (select_stuff::cleanup): New method.
(cygwin_select): Call cleanup explicitly to avoid a race.
(select_stuff:~select_stuff): Call cleanup chain via cleanup method.
(fhandler_socket::select_read): Set *_ready when shutdown has been called on
the socket.
(fhandler_socket::select_write): Ditto.
(fhandler_socket::select_except): Ditto.
* winsup.h: Move NO_COPY to "COMMON" section.
* autoload.cc (wsock_started): Avoid initializing NO_COPY value.
* sigproc.cc: Remove initialization from NO_COPY variables.
(sigproc_init): Initialize sig_loop_wait here, rather than via initialization.
(subproc_init): Initialize proc_loop_wait here, rather than via initialization.
Diffstat (limited to 'winsup/cygwin/Makefile.in')
-rw-r--r-- | winsup/cygwin/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 317616bdc..5e2a5620e 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -65,6 +65,7 @@ LD:=@LD@ DLLTOOL:=@DLLTOOL@ WINDRES:=@WINDRES@ AS:=@AS@ +LDSCRIPT=cygwin.sc # # Include common definitions for winsup directory @@ -194,9 +195,11 @@ new-$(LIB_NAME): $(LIB_NAME) # Rule to build cygwin.dll -new-$(DLL_NAME): $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) Makefile winver_stamp - $(CXX) $(CXXFLAGS) -nostdlib -Wl,-shared -o $@ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o \ - winver.o $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC) -lstdc++ -lgcc -lshell32 -luuid +new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) Makefile winver_stamp + $(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -shared -o $@ \ + -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ + $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC) \ + -lstdc++ -lgcc -lshell32 -luuid dll_ofiles: $(DLL_OFILES) |