Mon Mar 14 08:16:33 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/OS_NS_time.h:
        * ace/OS_NS_time.inl:
        * ace/OS_NS_time.cpp:
          Removed ghs method

        * ace/Guard_T.h:
          Doxygen change

        * ace/OS_NS_sys_utsname.cpp:
        * ace/Process.cpp:
        * ace/Process_Manager.cpp:
        * ace/WFMO_Reactor.cpp:
        * ace/config-sunos5.5.h:
        * ace/config-sunos5.7.h:
        * ace/config-vxworks6.4.h:
        * ace/config-win32-msvc.h:
          Removed ghs workaround

        * tests/Multihomed_INET_Addr_Test.cpp:
          Layout change

        * ace/gethrtime.cpp:
          Removed this file, ghs is not supported anymore a long time

        * ace/ace.mpc:
        * ace/Makefile.am:
          Removed gethrtime.cpp

17 files changed, 41 insertions, 146 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 681d0819349..b2450c0be8f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,33 @@
+Mon Mar 14 08:16:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_time.h:
+        * ace/OS_NS_time.inl:
+        * ace/OS_NS_time.cpp:
+          Removed ghs method
+
+        * ace/Guard_T.h:
+          Doxygen change
+
+        * ace/OS_NS_sys_utsname.cpp:
+        * ace/Process.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/WFMO_Reactor.cpp:
+        * ace/config-sunos5.5.h:
+        * ace/config-sunos5.7.h:
+        * ace/config-vxworks6.4.h:
+        * ace/config-win32-msvc.h:
+          Removed ghs workaround
+
+        * tests/Multihomed_INET_Addr_Test.cpp:
+          Layout change
+
+        * ace/gethrtime.cpp:
+          Removed this file, ghs is not supported anymore a long time
+
+        * ace/ace.mpc:
+        * ace/Makefile.am:
+          Removed gethrtime.cpp
+
 Sun Mar 13 10:32:34 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * tests/OS_Test.cpp (test_getpwnam_r):
@@ -178,7 +208,7 @@ Mon Mar  7 16:14:33 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
 Sun Mar  6 14:49:04 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * ACE-INSTALL.html: Update this document to explain how to use the
-          "make install" step for MinGW.  Thanks to Laura Autón García
+          "make install" step for MinGW.  Thanks to Laura Aut�n Garc�a
           <darklulu+ace at gmail dot com> for contributing this
           description.
 
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index 8efd96f6a22..3e5db085588 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -72,8 +72,8 @@ public:
   ACE_Guard (ACE_LOCK &l);
 
   /// Implicitly and automatically acquire (or try to acquire) the
-  /// lock.  If @a block is non-0 then <acquire> the <ACE_LOCK>, else
-  /// <tryacquire> it.
+  /// lock.  If @a block is non-0 then acquire() the ACE_LOCK, else
+  /// tryacquire() it.
   ACE_Guard (ACE_LOCK &l, bool block);
 
   /// Initialise the guard without implicitly acquiring the lock. The
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 1341434ddc3..6961e42953d 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -342,8 +342,7 @@ libACE_la_SOURCES = \
   WIN32_Proactor.cpp \
   XML_Svc_Conf.cpp \
   XTI_ATM_Mcast.cpp \
-  ace_wchar.cpp \
-  gethrtime.cpp
+  ace_wchar.cpp
 
 libACE_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp
index 9abd7edb37d..a00103fa0cd 100644
--- a/ACE/ace/OS_NS_sys_utsname.cpp
+++ b/ACE/ace/OS_NS_sys_utsname.cpp
@@ -78,11 +78,7 @@ ACE_OS::uname (ACE_utsname *name)
       char processor[bufsize] = "Unknown";
       char subtype[bufsize] = "Unknown";
 
-#   if defined (ghs)
-    WORD arch = sinfo.u.s.wProcessorArchitecture;
-#   else
     WORD arch = sinfo.wProcessorArchitecture;
-#   endif
 
       switch (arch)
         {
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index 6d7107688f1..8e93ffb7c78 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -327,28 +327,6 @@ ACE_OS::mktime (struct tm *t)
 #   endif /* ACE_HAS_WINCE */
 }
 
-#if defined (ACE_HAS_POWERPC_TIMER) && defined (ghs)
-void
-ACE_OS::readPPCTimeBase (u_long &most, u_long &least)
-{
-  ACE_OS_TRACE ("ACE_OS::readPPCTimeBase");
-
-  // This function can't be inline because it depends on the arguments
-  // being in particular registers (r3 and r4), in conformance with the
-  // EABI standard.  It would be nice if we knew how to put the variable
-  // names directly into the assembler instructions . . .
-  asm("aclock:");
-  asm("mftb  r5,TBU");
-  asm("mftb  r6,TBL");
-  asm("mftb  r7,TBU");
-  asm("cmpw  r5,r7");
-  asm("bne   aclock");
-
-  asm("stw r5, 0(r3)");
-  asm("stw r6, 0(r4)");
-}
-#endif /* ACE_HAS_POWERPC_TIMER && ghs */
-
 #if defined (ACE_LACKS_STRPTIME)
 char *
 ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm)
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index f364af8550f..f50bb23a61f 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -224,12 +224,6 @@ namespace ACE_OS
   int nanosleep (const struct timespec *requested,
                  struct timespec *remaining = 0);
 
-# if defined (ACE_HAS_POWERPC_TIMER) && defined (ghs)
-  extern ACE_Export
-  void readPPCTimeBase (u_long &most,
-                        u_long &least);
-# endif /* ACE_HAS_POWERPC_TIMER && ghs */
-
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strftime (char *s,
                    size_t maxsize,
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 9945f739c68..d3cde838580 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -207,10 +207,6 @@ ACE_OS::difftime (time_t t1, time_t t0)
 }
 #endif /* ! ACE_LACKS_DIFFTIME */
 
-#if defined (ghs) && defined (ACE_HAS_PENTIUM) && !defined (ACE_WIN32)
-  extern "C" ACE_hrtime_t ACE_GETHRTIME_NAME ();
-#endif /* ghs && ACE_HAS_PENTIUM */
-
 ACE_INLINE ACE_hrtime_t
 ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 {
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index f1cebecae39..9fe2bbb7015 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -517,13 +517,7 @@ ACE_Process::spawn (ACE_Process_Options &options)
           }
         else
           {
-# if defined (ghs)
-            // GreenHills 1.8.8 (for VxWorks 5.3.x) can't compile this
-            // code.  Processes aren't supported on VxWorks anyways.
-            ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-# else
             result = ACE_OS::execve (procname, procargv, procenv);
-# endif /* ghs */
           }
         if (result == -1)
           {
diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp
index cc00a43af71..128b9d1d799 100644
--- a/ACE/ace/Process_Manager.cpp
+++ b/ACE/ace/Process_Manager.cpp
@@ -843,7 +843,7 @@ ACE_Process_Manager::wait (pid_t pid,
           // WAIT_OBJECT_0 is a pointless comparison because
           // WAIT_OBJECT_0 is zero and DWORD is unsigned long, so this
           // test is skipped for Green Hills.  Same for mingw.
-# if defined (ghs) || defined (__MINGW32__) || defined (_MSC_VER)
+# if defined (__MINGW32__) || defined (_MSC_VER)
           ACE_ASSERT (result < WAIT_OBJECT_0 + this->current_count_);
 # else
           ACE_ASSERT (result >= WAIT_OBJECT_0
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index ba123d52cfe..398a96c4bef 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -1952,7 +1952,6 @@ ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status)
     {
       const bool ok = (
 #if ! defined(__BORLANDC__) \
-    && !defined (ghs) \
     && !defined (__MINGW32__) \
     && !defined (_MSC_VER)
                  // wait_status is unsigned in Borland, Green Hills,
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 3b68bc43f0c..9bbca7bbc5f 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -78,7 +78,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Functor.cpp
     Functor_String.cpp
     Get_Opt.cpp
-    gethrtime.cpp
     Handle_Ops.cpp
     Handle_Set.cpp
     Hashable.cpp
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 6591a7a8c73..9b8b0d0f910 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -125,33 +125,11 @@
 #   endif /* _REENTRANT */
 # endif /* !ACE_MT_SAFE */
 
-#elif defined (ghs)
-
-# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
-    // ACE_MT_SAFE is #defined below, for all compilers.
-#   if !defined (_REENTRANT)
-    /* If you want to disable threading, comment out the following
-       line.  Or, add -DACE_MT_SAFE=0 to your CFLAGS, e.g., using
-       make threads=0. */
-#     define _REENTRANT
-#   endif /* _REENTRANT */
-# endif /* !ACE_MT_SAFE */
-
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
-
-  // To avoid warning about inconsistent declaration between Sun's
-  // stdlib.h and Green Hills' ctype.h.
-# include <stdlib.h>
-
-  // IOStream_Test never halts with Green Hills 1.8.9.
-# define ACE_LACKS_ACE_IOSTREAM
-
-#else  /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
+#else  /* ! __SUNPRO_CC && ! __GNUG__ */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler in ace/config-sunos5.5.h
 #  endif /* __cplusplus */
-#endif /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
+#endif /* ! __SUNPRO_CC && ! __GNUG__ */
 
 #if !defined (__ACE_INLINE__)
 // @note If you have link problems with undefined inline template
diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h
index c8bc3ab976b..38476485251 100644
--- a/ACE/ace/config-sunos5.7.h
+++ b/ACE/ace/config-sunos5.7.h
@@ -25,17 +25,10 @@
 // SunOS 5.7 has getloadavg()
 #undef ACE_LACKS_GETLOADAVG
 
-#if defined (ghs)
-  // SunOS 5.7's /usr/include/sys/procfs_isa.h needs uint64_t,
-  // but /usr/include/sys/int_types.h doesn't #define it because
-  // _NO_LONGLONG is #
-# undef ACE_HAS_PROC_FS
-# undef ACE_HAS_PRUSAGE_T
-
-#elif defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)
   // Wide character methods are in std:: when using SunCC 5.3
 # define ACE_WCHAR_IN_STD_NAMESPACE
-#endif /* __GNUG__ || ghs */
+#endif
 
 // SunOS 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER.
 #undef ACE_HAS_ONLY_SCHED_OTHER
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index f6b49a4ab8f..eab96f20850 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -48,7 +48,7 @@
 #elif defined (__DCC__)
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_TEMPLATES_REQUIRE_SOURCE
-#else  /* ! __GNUG__ && ! ghs && !__DCC__ */
+#else  /* ! __GNUG__ && !__DCC__ */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler on VxWorks
 #  endif  /* __cplusplus */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index c19f3e6fb3f..f223766aa52 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -156,7 +156,7 @@
 #     pragma warning(disable: 1744)  /* field of class type without a DLL interface used in a class with a DLL interface */
 #     pragma warning(disable: 1738)
 # endif
-#endif /* !ALL_WARNINGS && _MSV_VER && !ghs && !__MINGW32__ */
+#endif /* !ALL_WARNINGS && _MSV_VER && !__MINGW32__ */
 
 // STRICT type checking in WINDOWS.H enhances type safety for Windows
 // programs by using distinct types to represent all the different
diff --git a/ACE/ace/gethrtime.cpp b/ACE/ace/gethrtime.cpp
deleted file mode 100644
index df66423dcc1..00000000000
--- a/ACE/ace/gethrtime.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-//
-// Build this file with g++.  It can be linked in to a ACE application
-// that was compiled with GreenHills.  It wouldn't be necessary if I
-// knew a way to correctly move values from registers to a 64-bit
-// variable in GHS asm code.  That's easy with g++ asm.
-
-#include "ace/config-all.h"
-
-
-
-#if defined (ghs) && (defined (i386) || defined(__i386__))
-
-#include "ace/OS_NS_time.h"
-
-extern "C"
-ACE_hrtime_t
-ACE_GETHRTIME_NAME (void)
-{
-#if defined (ACE_HAS_PENTIUM)
-  // ACE_TRACE ("ACE_GETHRTIME_NAME");
-
-#if defined (ACE_LACKS_LONGLONG_T)
-  double now;
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_hrtime_t now;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-  // Read the high-res tick counter directly into memory variable
-  // "now".  The A constraint signifies a 64-bit int.
-#if defined (__GNUG__)
-  asm volatile ("rdtsc" : "=A" (now) : : "memory");
-// #elif defined (ghs)
-// The following doesn't work.  For now, this file must be compile with g++.
-//  asm ("rdtsc");
-//  asm ("movl %edx,-16(%ebp)");
-//  asm ("movl %eax,-12(%ebp)");
-#else
-# error unsupported compiler
-#endif
-
-#if defined (ACE_LACKS_LONGLONG_T)
-  // ACE_U_LongLong doesn't have the same layout as now, so construct
-  // it "properly".
-  ACE_UINT32 least, most;
-  ACE_OS::memcpy (&least, &now, sizeof (ACE_UINT32));
-  ACE_OS::memcpy (&most, (unsigned char *) &now + sizeof (ACE_UINT32),
-                  sizeof (ACE_UINT32));
-
-  const ACE_hrtime_t ret (least, most);
-  return ret;
-#else  /* ! ACE_LACKS_LONGLONG_T */
-  return now;
-#endif /* ! ACE_LACKS_LONGLONG_T */
-
-#else  /* ! ACE_HAS_PENTIUM */
-# error This file can _only_ be compiled with ACE_HAS_PENTIUM.
-#endif /* ! ACE_HAS_PENTIUM */
-}
-#endif /* ghs */
diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp
index 62ea7ed2aee..c68df6da834 100644
--- a/ACE/tests/Multihomed_INET_Addr_Test.cpp
+++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp
@@ -465,5 +465,4 @@ int run_main (int, ACE_TCHAR *[])
 
   ACE_END_TEST;
   return status;
-
 }