Merge changes from emacs-23 branch.

2 files changed, 8 insertions, 11 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3e8adcb1b27..49626c5a86f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-19  Ken Brown  <kbrown@cornell.edu>
+
+        * PROBLEMS: Update Cygwin GCC information.  (Bug#6458)
+
 2010-06-12  Glenn Morris  <rgm@gnu.org>
 
         * tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 8c6a37dbd45..e6174b5edc6 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2339,17 +2339,10 @@ files are installed. Then use:
 
 (using the location of the 32-bit X libraries on your system).
 
-*** Building the Cygwin port for MS-Windows can fail with some GCC versions
-
-Building Emacs 22 with Cygwin builds of GCC 3.4.4-1 and 3.4.4-2 is
-reported to either fail or cause Emacs to segfault at run time.  In
-addition, the Cygwin GCC 3.4.4-2 has problems with generating debug
-info.  Cygwin users are advised not to use these versions of GCC for
-compiling Emacs.  GCC versions 4.0.3, 4.0.4, 4.1.1, and 4.1.2
-reportedly build a working Cygwin binary of Emacs, so we recommend
-these GCC versions.  Note that these versions of GCC, 4.0.3, 4.0.4,
-4.1.1, and 4.1.2, are currently the _only_ versions known to succeed
-in building Emacs (as of v22.1).
+*** Building Emacs for Cygwin can fail with GCC 3
+
+As of Emacs 22.1, there have been stability problems with Cygwin
+builds of Emacs using GCC 3.  Cygwin users are advised to use GCC 4.
 
 *** Building the native MS-Windows port fails due to unresolved externals