11 files changed, 14 insertions, 11 deletions
diff --git a/gcc/config/i386/cygwin32.asm b/gcc/config/i386/cygwin.asm
index 4ac4c91a3b1..4ac4c91a3b1 100644
--- a/gcc/config/i386/cygwin32.asm
+++ b/gcc/config/i386/cygwin.asm
diff --git a/gcc/config/i386/cygwin32.h b/gcc/config/i386/cygwin.h
index af0b25e5917..af0b25e5917 100644
--- a/gcc/config/i386/cygwin32.h
+++ b/gcc/config/i386/cygwin.h
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index cd4d3e6a894..3ef5c5b849c 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -21,10 +21,10 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA. */
 
-/* Most of this is the same as for Cygwin32, except for changing some
+/* Most of this is the same as for cygwin, except for changing some
    specs.  */
 
-#include "i386/cygwin32.h"
+#include "i386/cygwin.h"
 
 /* Please keep changes to CPP_PREDEFINES in sync with i386/crtdll. The
    only difference between the two should be __MSVCRT__ needed to 
diff --git a/gcc/config/i386/t-cygwin32 b/gcc/config/i386/t-cygwin
index 20bc9803b1e..175f66be6f3 100644
--- a/gcc/config/i386/t-cygwin32
+++ b/gcc/config/i386/t-cygwin
@@ -1,9 +1,9 @@
 LIBGCC1 = libgcc1-asm.a
 CROSS_LIBGCC1 = libgcc1-asm.a
-LIB1ASMSRC = i386/cygwin32.asm
+LIB1ASMSRC = i386/cygwin.asm
 LIB1ASMFUNCS = _chkstk
 
-# cygwin32 always has a limits.h, but, depending upon how we are doing
+# cygwin always has a limits.h, but, depending upon how we are doing
 # the build, it may not be installed yet.
 LIMITS_H_TEST = true
 
diff --git a/gcc/config/i386/win32.h b/gcc/config/i386/win32.h
index a8b6904cdb0..f6cc4516648 100644
--- a/gcc/config/i386/win32.h
+++ b/gcc/config/i386/win32.h
@@ -71,7 +71,7 @@ Boston, MA 02111-1307, USA. */
 #undef CPP_SPEC
 #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
   %{!mcygwin:-iwithprefixbefore include/mingw32 -D__MINGW32__}    \
-  %{mcygwin:-D__CYGWIN32__}"
+  %{mcygwin:-D__CYGWIN32__ -D__CYGWIN__}"
 
 /* We have to dynamic link to get to the system DLLs.  All of libc, libm and
    the Unix stuff is in cygwin.dll.  The import library is called
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 42937286fe9..f1a2d4b83be 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -493,7 +493,7 @@ i386_pe_unique_section (decl, reloc)
 }
 
 /* The Microsoft linker requires that every function be marked as
-   DT_FCN.  When using gas on cygwin32, we must emit appropriate .type
+   DT_FCN.  When using gas on cygwin, we must emit appropriate .type
    directives.  */
 
 #include "gsyms.h"
diff --git a/gcc/config/i386/x-cygwin32 b/gcc/config/i386/x-cygwin
index f251835bd33..f251835bd33 100644
--- a/gcc/config/i386/x-cygwin32
+++ b/gcc/config/i386/x-cygwin
diff --git a/gcc/config/i386/xm-cygwin32.h b/gcc/config/i386/xm-cygwin.h
index 67040fea7ce..86285436a8f 100644
--- a/gcc/config/i386/xm-cygwin32.h
+++ b/gcc/config/i386/xm-cygwin.h
@@ -40,11 +40,11 @@ do {									\
   _epath = _win32epath = getenv (NAME);					\
   /* if we have a posix path list, convert to win32 path list */	\
   if (_epath != NULL && *_epath != 0					\
-      && cygwin32_posix_path_list_p (_epath))				\
+      && cygwin_posix_path_list_p (_epath))				\
     {									\
       _win32epath = (char *) xmalloc					\
-	(cygwin32_posix_to_win32_path_list_buf_size (_epath));		\
-      cygwin32_posix_to_win32_path_list (_epath, _win32epath);		\
+	(cygwin_posix_to_win32_path_list_buf_size (_epath));		\
+      cygwin_posix_to_win32_path_list (_epath, _win32epath);		\
     }									\
   (VAR) = _win32epath;							\
 } while (0)
diff --git a/gcc/config/rs6000/cygwin32.h b/gcc/config/rs6000/cygwin.h
index 557b3016ad9..0ed448b2124 100644
--- a/gcc/config/rs6000/cygwin32.h
+++ b/gcc/config/rs6000/cygwin.h
@@ -5,7 +5,7 @@
    to build GCC for use with a windows style library and tool
    set, winnt.h uses the Microsoft tools to do that.
 
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -33,9 +33,12 @@ Boston, MA 02111-1307, USA. */
 #undef CPP_PREDEFINES
 #endif
 
-#define	CPP_PREDEFINES "-D_WIN32 -DWINNT -D__CYGWIN32__ -DPOSIX \
+#define	CPP_PREDEFINES "-D_WIN32 -DWINNT -D__CYGWIN__ -D__CYGWIN32__ -DPOSIX \
   -D_POWER -D_ARCH_PPC -D__PPC__ -Asystem(winnt) -Acpu(powerpc) -Amachine(powerpc)"
 
+#undef CPP_SPEC
+#define CPP_SPEC "-remap %{posix: -D_POSIX_SOURCE} %(cpp_cpu)"
+
 /* We have to dynamic link to get to the system DLLs.  All of libc, libm and
    the Unix stuff is in cygwin.dll.  The import library is called
    'libcygwin.a'.  For Windows applications, include more libraries, but
diff --git a/gcc/config/rs6000/x-cygwin32 b/gcc/config/rs6000/x-cygwin
index 5e796a0e916..5e796a0e916 100644
--- a/gcc/config/rs6000/x-cygwin32
+++ b/gcc/config/rs6000/x-cygwin
diff --git a/gcc/config/rs6000/xm-cygwin32.h b/gcc/config/rs6000/xm-cygwin.h
index ca548319c10..ca548319c10 100644
--- a/gcc/config/rs6000/xm-cygwin32.h
+++ b/gcc/config/rs6000/xm-cygwin.h