Jumbo patch from Geoff Noer to rename CYGWIN32 to CYGWIN.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23622 138bc75d-0d04-0410-961f-82ee72b054a4

21 files changed, 90 insertions, 55 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d80763497a3..daeb7e97624 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,35 @@
+Thu Nov 12 19:20:57 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* i386/cygwin32.asm: Delete.
+	* i386/cygwin.asm: New file, renamed from cygwin32.asm.
+	* i386/cygwin32.h: Delete.
+	* i386/cygwin.h: New file, renamed from cygwin32.h.
+	* i386/t-cygwin32: Delete.
+	* i386/t-cygwin: New file, renamed from t-cygwin32.  Include
+	cygwin.asm instead of cygwin32.asm.  Remove "32" from comment.
+	* i386/x-cygwin32: Delete.
+	* i386/x-cygwin: New file, renamed from x-cygwin32.
+	* i386/xm-cygwin32: Delete.
+	* i386/xm-cygwin: New file, renamed from xm-cygwin32.  Use newly
+	renamed cygwin_ funcs for path translations.
+	* i386/win32.h: Define __CYGWIN__ when -mcygwin given.
+	* i386/winnt.c: Remove "32" from comment about cygwin.
+	* i386/mingw32.h: Fix references to cygwin32.h in light of above.
+	* rs6000/cygwin32.h: Delete.
+	* rs6000/cygwin.h: New file, renamed from cygwin32.h.  Add
+	-D__CYGWIN__ to CPP_PREDEFINES.
+	* rs6000/x-cygwin32: Delete.
+	* rs6000/x-cygwin: New file, renamed from x-cygwin32.
+	* rs6000/xm-cygwin32: Delete.
+	* rs6000/xm-cygwin: New file, renamed from xm-cygwin32.
+
+	* configure.in: Check for cygwin* instead of cygwin32.  Account
+	for the rename of cygwin-related config files to lose the "32"s.
+	* configure: Regenerate.
+
+	* cccp.c, collect2.c, gcc.c, getpwd.c, libgcc2.c, protoize.c,
+	toplev.c: Change all refs to __CYGWIN32__ to __CYGWIN__.
+
 Wed Nov 11 12:25:19 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in (JAVAGC): New macro.
diff --git a/gcc/cccp.c b/gcc/cccp.c
index e3568daa567..0d55cec2d5c 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -84,7 +84,7 @@ static int hack_vms_include_specification ();
 #endif /* VMS */
 
 /* Windows does not natively support inodes, and neither does MSDOS.  */
-#if (defined (_WIN32) && ! defined (CYGWIN32)) || defined (__MSDOS__)
+#if (defined (_WIN32) && ! defined (__CYGWIN__)) || defined (__MSDOS__)
 #define INO_T_EQ(a, b) 0
 #endif
 
@@ -4888,10 +4888,10 @@ static int
 absolute_filename (filename)
      char *filename;
 {
-#if defined (__MSDOS__) || (defined (_WIN32) && !defined (__CYGWIN32__))
+#if defined (__MSDOS__) || (defined (_WIN32) && !defined (__CYGWIN__))
   if (ISALPHA (filename[0]) && filename[1] == ':') filename += 2;
 #endif
-#if defined (__CYGWIN32__)
+#if defined (__CYGWIN__)
   /* At present, any path that begins with a drive spec is absolute.  */
   if (ISALPHA (filename[0]) && filename[1] == ':') return 1;
 #endif
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 729682e5f3b..6f914062e72 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "demangle.h"
 #include "obstack.h"
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 #include <process.h>
 #endif
 
@@ -1721,7 +1721,7 @@ collect_execute (prog, argv, redir)
   if (argv[0] == 0)
     fatal ("cannot find `%s'", prog);
 
-#ifndef __CYGWIN32__
+#ifndef __CYGWIN__
   pid = vfork ();
   if (pid == -1)
     fatal_perror (VFORK_STRING);
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
diff --git a/gcc/configure b/gcc/configure
index 298d30d9b79..622937de8ca 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -3668,10 +3668,10 @@ for machine in $build $host $target; do
 		xmake_file=i386/x-vsta
 		;;
 	i[34567]86-*-win32)
-		xm_file="${xm_file} i386/xm-cygwin32.h"
-		tmake_file=i386/t-cygwin32
+		xm_file="${xm_file} i386/xm-cygwin.h"
+		tmake_file=i386/t-cygwin
 		tm_file=i386/win32.h
-		xmake_file=i386/x-cygwin32
+		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
@@ -3679,11 +3679,11 @@ for machine in $build $host $target; do
 		fi
 		exeext=.exe
 		;;
-	i[34567]86-*-pe | i[34567]86-*-cygwin32)
-		xm_file="${xm_file} i386/xm-cygwin32.h"
-		tmake_file=i386/t-cygwin32
-		tm_file=i386/cygwin32.h
-		xmake_file=i386/x-cygwin32
+	i[34567]86-*-pe | i[34567]86-*-cygwin*)
+		xm_file="${xm_file} i386/xm-cygwin.h"
+		tmake_file=i386/t-cygwin
+		tm_file=i386/cygwin.h
+		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
@@ -3694,9 +3694,9 @@ for machine in $build $host $target; do
 	i[34567]86-*-mingw32*)
 		tm_file=i386/mingw32.h
 		xm_file="${xm_file} i386/xm-mingw32.h"
-		tmake_file="i386/t-cygwin32 i386/t-mingw32"
+		tmake_file="i386/t-cygwin i386/t-mingw32"
 		extra_objs=winnt.o
-		xmake_file=i386/x-cygwin32
+		xmake_file=i386/x-cygwin
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
@@ -4976,11 +4976,11 @@ for machine in $build $host $target; do
 		fi
 		extra_headers=ppc-asm.h
 		;;
-	powerpcle-*-pe | powerpcle-*-cygwin32)
-		tm_file=rs6000/cygwin32.h
-		xm_file="rs6000/xm-cygwin32.h ${xm_file}"
+	powerpcle-*-pe | powerpcle-*-cygwin*)
+		tm_file=rs6000/cygwin.h
+		xm_file="rs6000/xm-cygwin.h ${xm_file}"
 		tmake_file=rs6000/t-winnt
-		xmake_file=rs6000/x-cygwin32
+		xmake_file=rs6000/x-cygwin
 #		extra_objs=pe.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
diff --git a/gcc/configure.in b/gcc/configure.in
index cba1cf26f27..e1db30786aa 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1447,10 +1447,10 @@ changequote([,])dnl
 changequote(,)dnl
 	i[34567]86-*-win32)
 changequote([,])dnl
-		xm_file="${xm_file} i386/xm-cygwin32.h"
-		tmake_file=i386/t-cygwin32
+		xm_file="${xm_file} i386/xm-cygwin.h"
+		tmake_file=i386/t-cygwin
 		tm_file=i386/win32.h
-		xmake_file=i386/x-cygwin32
+		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
@@ -1459,12 +1459,12 @@ changequote([,])dnl
 		exeext=.exe
 		;;
 changequote(,)dnl
-	i[34567]86-*-pe | i[34567]86-*-cygwin32)
+	i[34567]86-*-pe | i[34567]86-*-cygwin*)
 changequote([,])dnl
-		xm_file="${xm_file} i386/xm-cygwin32.h"
-		tmake_file=i386/t-cygwin32
-		tm_file=i386/cygwin32.h
-		xmake_file=i386/x-cygwin32
+		xm_file="${xm_file} i386/xm-cygwin.h"
+		tmake_file=i386/t-cygwin
+		tm_file=i386/cygwin.h
+		xmake_file=i386/x-cygwin
 		extra_objs=winnt.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
@@ -1477,9 +1477,9 @@ changequote(,)dnl
 changequote([,])dnl
 		tm_file=i386/mingw32.h
 		xm_file="${xm_file} i386/xm-mingw32.h"
-		tmake_file="i386/t-cygwin32 i386/t-mingw32"
+		tmake_file="i386/t-cygwin i386/t-mingw32"
 		extra_objs=winnt.o
-		xmake_file=i386/x-cygwin32
+		xmake_file=i386/x-cygwin
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
 			thread_file='win32'
@@ -2775,11 +2775,11 @@ changequote([,])dnl
 		fi
 		extra_headers=ppc-asm.h
 		;;
-	powerpcle-*-pe | powerpcle-*-cygwin32)
-		tm_file=rs6000/cygwin32.h
-		xm_file="rs6000/xm-cygwin32.h ${xm_file}"
+	powerpcle-*-pe | powerpcle-*-cygwin*)
+		tm_file=rs6000/cygwin.h
+		xm_file="rs6000/xm-cygwin.h ${xm_file}"
 		tmake_file=rs6000/t-winnt
-		xmake_file=rs6000/x-cygwin32
+		xmake_file=rs6000/x-cygwin
 #		extra_objs=pe.o
 		fixincludes=Makefile.in
  		if test x$enable_threads = xyes; then
diff --git a/gcc/gcc.c b/gcc/gcc.c
index d7ff558da97..57ac3fdc32d 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2267,7 +2267,7 @@ execute ()
   for (n_commands = 1, i = 0; i < argbuf_index; i++)
     if (strcmp (argbuf[i], "|") == 0)
       {				/* each command.  */
-#if defined (__MSDOS__) || (defined (_WIN32) && defined (__CYGWIN32_)) || defined (OS2) || defined (VMS)
+#if defined (__MSDOS__) || (defined (_WIN32) && defined (__CYGWIN__)) || defined (OS2) || defined (VMS)
         fatal ("-pipe not supported");
 #endif
 	argbuf[i] = 0;	/* termination of command args.  */
diff --git a/gcc/getpwd.c b/gcc/getpwd.c
index 947383ef9a4..69f8c8243b5 100644
--- a/gcc/getpwd.c
+++ b/gcc/getpwd.c
@@ -22,7 +22,7 @@
 
 char *xmalloc ();
 
-#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
+#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)))
 
 /* Get the working directory.  Use the PWD environment variable if it's
    set correctly, since this is faster and gives more uniform answers
@@ -70,7 +70,7 @@ getpwd ()
   return p;
 }
 
-#else	/* VMS || _WIN32 && !__CYGWIN32__ */
+#else	/* VMS || _WIN32 && !__CYGWIN__ */
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 255
@@ -90,4 +90,4 @@ getpwd ()
   return pwd;
 }
 
-#endif	/* VMS || _WIN32 && !__CYGWIN32__ */
+#endif	/* VMS || _WIN32 && !__CYGWIN__ */
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index d2080b28d08..029c624c6a5 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -2572,7 +2572,7 @@ __clear_cache (char *beg, char *end)
 
 /* Jump to a trampoline, loading the static chain address.  */
 
-#if defined(WINNT) && ! defined(__CYGWIN32__)
+#if defined(WINNT) && ! defined(__CYGWIN__)
 
 long getpagesize()
 {
@@ -2810,7 +2810,7 @@ cacheflush (char *beg, int size, int flag)
 #endif /* sony_news */
 #endif /* L_trampoline */
 
-#ifndef __CYGWIN32__
+#ifndef __CYGWIN__
 #ifdef L__main
 
 #include "gbl-ctors.h"
@@ -2892,7 +2892,7 @@ SYMBOL__MAIN ()
 #endif /* no HAS_INIT_SECTION or INVOKE__main */
 
 #endif /* L__main */
-#endif /* __CYGWIN32__ */
+#endif /* __CYGWIN__ */
 
 #ifdef L_ctors
 
diff --git a/gcc/protoize.c b/gcc/protoize.c
index 8a47b2f6815..e5bed8dfc88 100644
--- a/gcc/protoize.c
+++ b/gcc/protoize.c
@@ -59,7 +59,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
 #include <sys/stat.h>
-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+#if ! defined (_WIN32) || defined (__CYGWIN__)
 #if defined(POSIX) || defined(CONCURRENT)
 #include <dirent.h>
 #else
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 851ed3e94e1..2d0cea0f08f 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1252,7 +1252,7 @@ get_run_time ()
 #ifdef __BEOS__
   return 0;
 #else /* not BeOS */
-#if defined (_WIN32) && !defined (__CYGWIN32__)
+#if defined (_WIN32) && !defined (__CYGWIN__)
   if (clock() < 0)
     return 0;
   else
@@ -4947,7 +4947,7 @@ main (argc, argv)
 
   compile_file (filename);
 
-#if !defined(OS2) && !defined(VMS) && (!defined(_WIN32) || defined (__CYGWIN32__))
+#if !defined(OS2) && !defined(VMS) && (!defined(_WIN32) || defined (__CYGWIN__))
   if (flag_print_mem)
     {
       char *lim = (char *) sbrk (0);
@@ -4963,7 +4963,7 @@ main (argc, argv)
 #endif /* not USG */
 #endif
     }
-#endif /* ! OS2 && ! VMS && (! _WIN32 || CYGWIN32) */
+#endif /* ! OS2 && ! VMS && (! _WIN32 || CYGWIN) */
 
   if (errorcount)
     exit (FATAL_EXIT_CODE);