--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-11  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/configtool.cpp: Workaround an exception handling
+	issue with Cygwin 1.5.20.
+
 2005-07-09  Bart Veer  <bartv@ecoscentric.com>
 
 	* common/common/build.cxx: add support for C++ files that use a

--- a/host/tools/configtool/standalone/common/ecosconfig.cxx
+++ b/host/tools/configtool/standalone/common/ecosconfig.cxx
@@ -1,6 +1,7 @@
 //####COPYRIGHTBEGIN####
 //                                                                          
 // ----------------------------------------------------------------------------
+// Copyright (C) 2004, 2005, 2006 eCosCentric Limited
 // Copyright (C) 2003 Bart Veer
 // Copyright (C) 2003 John Dallaway
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
@@ -52,7 +53,7 @@
 #include "ecosconfig.hxx"
 
 #define TOOL_VERSION "2.net"
-#define TOOL_COPYRIGHT "Copyright (c) 2002 Red Hat, Inc."
+#define TOOL_COPYRIGHT "Copyright (c) 2002 Red Hat, Inc.\nCopyright (c) 2004-2006 eCosCentric Limited"
 #define DEFAULT_SAVE_FILE "ecos.ecc"
 static char* tool = "ecosconfig";
 

--- a/host/tools/configtool/standalone/wxwin/configtool.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtool.cpp
@@ -3,7 +3,7 @@
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
 // Copyright (C) 2003 John Dallaway
-// Copyright (C) 2004 eCosCentric Limited
+// Copyright (C) 2004, 2005, 2006 eCosCentric Limited
 //
 // This program is part of the eCos host tools.
 //
@@ -160,6 +160,13 @@ ecApp::~ecApp()
 // 'Main program' equivalent: the program execution "starts" here
 bool ecApp::OnInit()
 {
+// workaround for an exception handling issue with Cygwin 1.5.20
+#ifdef __CYGWIN__
+    try {
+        throw int(42);
+    } catch(...) { };
+#endif
+
     wxLog::SetTimestamp(NULL);
 
     wxHelpProvider::Set(new wxSimpleHelpProvider);

--- a/host/tools/configtool/standalone/wxwin/mainwin.cpp
+++ b/host/tools/configtool/standalone/wxwin/mainwin.cpp
@@ -3,7 +3,7 @@
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
 // Copyright (C) 2003 John Dallaway
-// Copyright (C) 2004 eCosCentric Limited
+// Copyright (C) 2004, 2005, 2006 eCosCentric Limited
 //
 // This program is part of the eCos host tools.
 //
@@ -552,7 +552,7 @@ void ecMainFrame::OnAbout(wxCommandEvent
 //    ecAboutDialog dialog(this, ecID_ABOUT_DIALOG, _("About eCos Configuration Tool"));
 //    dialog.ShowModal();
 	wxString msg;
-	msg.Printf("eCos Configuration Tool %s (%s %s)\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003\nCopyright (c) eCosCentric Limited 2004", ecCONFIGURATION_TOOL_VERSION, __DATE__, __TIME__);
+	msg.Printf("eCos Configuration Tool %s (%s %s)\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003\nCopyright (c) eCosCentric Limited 2004-2006", ecCONFIGURATION_TOOL_VERSION, __DATE__, __TIME__);
     wxMessageBox(msg, _("About eCos Configuration Tool"), wxICON_INFORMATION | wxOK);
 }
 

--- a/host/tools/ecostest/ChangeLog
+++ b/host/tools/ecostest/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-10  John Dallaway  <jld@ecoscentric.com>
+
+	* common/eCosTestUtils.cpp, common/eCosTestUtils.h: Tweak function
+	prototypes for GCC 3.4.4.
+
 2003-04-11  John Dallaway  <jld@ecoscentric.com>
 
 	* common/eCosTestPlatform.cpp (CeCosTestPlatform::Load): Return

--- a/host/tools/ecostest/common/eCosTestUtils.cpp
+++ b/host/tools/ecostest/common/eCosTestUtils.cpp
@@ -2,6 +2,7 @@
 //                                                                          
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+// Copyright (C) 2006 eCosCentric Limited
 //
 // This program is part of the eCos host tools.
 //
@@ -57,7 +58,7 @@ LPCTSTR  const CeCosTestUtils::Tail(LPCT
 }
 
 // File iterator.  Gets next file in directory, avoiding _T(".") and _T("..")
-bool CeCosTestUtils::NextFile (void *&pHandle,String &str)
+bool CeCosTestUtils::NextFile (void *pHandle,String &str)
 {
 #ifdef _WIN32
   WIN32_FIND_DATA fd;
@@ -77,7 +78,7 @@ bool CeCosTestUtils::NextFile (void *&pH
   }
   
   // Start file iteration and return first file.
-bool CeCosTestUtils::StartSearch (void *&pHandle,String &str)
+bool CeCosTestUtils::StartSearch (void *pHandle,String &str)
   {
 #ifdef _WIN32
     WIN32_FIND_DATA fd;
@@ -86,7 +87,7 @@ bool CeCosTestUtils::StartSearch (void *
       ERROR(_T("Failed to open dir\n"));
       return false;
     } else if (fd.cFileName[0]=='.') {
-      return NextFile((HANDLE)pHandle,str);
+      return NextFile(pHandle,str);
     } else {
 		str=String(fd.cFileName);
       return true;
@@ -102,7 +103,7 @@ bool CeCosTestUtils::StartSearch (void *
   }
   
   // End file iteration
-void CeCosTestUtils::EndSearch (void *&pHandle)
+void CeCosTestUtils::EndSearch (void *pHandle)
   {
 #ifdef _WIN32
     FindClose((HANDLE)pHandle);

--- a/host/tools/ecostest/common/eCosTestUtils.h
+++ b/host/tools/ecostest/common/eCosTestUtils.h
@@ -2,6 +2,7 @@
 //                                                                          
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+// Copyright (C) 2006 eCosCentric Limited
 //
 // This program is part of the eCos host tools.
 //
@@ -65,11 +66,11 @@ public:
   static bool IsFile (LPCTSTR pszFile);
 
   // File iterator.  Gets next file in directory, avoiding "." and ".."
-  static bool NextFile (void *&pHandle,String &str);
+  static bool NextFile (void *pHandle,String &str);
   // Start file iteration and return first file.
-  static bool StartSearch (void *&pHandle,String &str);
+  static bool StartSearch (void *pHandle,String &str);
   // End file iteration
-  static void EndSearch (void *&pHandle);
+  static void EndSearch (void *pHandle);
 
   // Get the file name of a "home directory" file
   static const String HomeFile (LPCTSTR pszFile);