Patch suggested by Mumit Khan <khan@xraylith.wisc.edu>:

* strace.cc (_impure_ptr): New global variable to make strace build under
Cygwin gcc.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 2030f17..49e42bb 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar 18 22:52:37 2000  Christopher Faylor <cgf@cygnus.com>
+
+       Patch suggested by Mumit Khan  <khan@xraylith.wisc.edu>:
+       * strace.cc (_impure_ptr): New global variable to make strace build
+       under Cygwin gcc.
+
 Sat Mar 18 12:45:10 2000  Christopher Faylor <cgf@cygnus.com>
 
        * Makefile.in: Make CXXFLAGS consistent with cygwin.

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index c5515ca..d76aba1 100644 (file)
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -33,7 +33,7 @@ CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -nostdinc++ -fno-rtti
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES:=-I$(updir)/mingw/include
+MINGW_INCLUDES:=-I$(mingw_source)/include -I$(cygwin_source)/include -I$(w32api_include)
 
 MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES)
 MINGW_CFLAGS:=$(CFLAGS) -mno-cygwin $(MINGW_INCLUDES)
@@ -75,7 +75,7 @@ strace.exe: strace.cc mingw_getopt.o $(MINGW_DEP_LDLIBS)
 ifdef VERBOSE
        $(CC) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
 else
-       @echo $(CC) -mno-cygwin -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
+       @echo $(CC) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
        $(CC) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
 endif
 

diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
index 9d58bf6..4b08e91 100644 (file)
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/strace.cc
@@ -8,6 +8,12 @@
 #include <signal.h>
 #include "sys/strace.h"
 
+/*  GCC runtime library's C++ EH code unfortunately pulls in stdio, and we
+   get undefine references to __impure_ptr, and hence the following
+   hack. It should be reasonably safe however as long as this file
+   is built using -mno-cygwin as is intended.  */
+int _impure_ptr;
+
 static const char *pgm;
 static int forkdebug = 0;
 static int numerror = 1;