Merge pull request #1372 from jwillemsen/jwi-alpha

Remove support for the Alpha CPU

10 files changed, 14 insertions, 51 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 45d215f7528..0b7bb001acb 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -185,7 +185,7 @@ document</a>.</p><p>
         Windows CE, MinGW, Microsoft Visual C++, GCC,
         Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64,
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
-        Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
+        Tru64, SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
         HPUX on IA64, and Android.
         The Intel C++ compiler is supported on
         Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX.
@@ -2187,10 +2187,10 @@ libraries.
   </p></li><li><b><a name="Linux">Linux</a></b><p>
 
       ACE has been ported to Linux on
-      Intel, Alpha, and PowerPC platforms.  If you use a RedHat 5.x
+      Intel, PowerPC platforms.  If you use a RedHat 5.x
       distribution, it's best to use RedHat 5.1 or later.  ACE works
       without any modifications on RedHat 5.1 and later, and on
-      Debian 2.1 on both Intel and Alpha.  Use the
+      Debian 2.1 on Intel.  Use the
       <code>platform_linux.GNU</code> and <code>ace/config-linux.h</code>
       in your <code>platform_macros.GNU</code> and
       <code>config.h</code> files, respectively.  The same
diff --git a/ACE/NEWS b/ACE/NEWS
index 5406504f6d0..4f2bf9e45ba 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -50,6 +50,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.12 and ACE-7.0.0
     to LLD and you want to use the GNU linkers, put `androind_set_lld := 0` in
     `platform_macros.GNU`.
 
+. Removed support for the Alpha CPU
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.11 and ACE-6.5.12
 ======================================================
 
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 7fec1b2f188..dfff2f97615 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -268,7 +268,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
   // Note that Itanium hardware (IA64) can run in either byte order. It's
   // selected by the OS when loading; Windows runs little, HP-UX runs big.
 #   if defined (i386) || defined (__i386__) || defined (_M_IX86) || \
-     defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \
+     defined (vax) || defined (__LITTLE_ENDIAN__) || \
      defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \
      defined (__amd64) || \
      ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux))
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp
index 17344b409a2..556eb62bf7e 100644
--- a/ACE/ace/High_Res_Timer.cpp
+++ b/ACE/ace/High_Res_Timer.cpp
@@ -30,7 +30,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 // ACE_OS::gethrtime.  We'll still set this to one to prevent division
 // by zero errors.
 #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \
-     defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \
+     defined (ACE_HAS_PENTIUM)) && \
     !defined (ACE_HAS_HI_RES_TIMER)
 
 # include "ace/Guard_T.h"
@@ -48,7 +48,7 @@ ACE_High_Res_Timer::global_scale_factor_type ACE_High_Res_Timer::global_scale_fa
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #else  /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
-             ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER)  ||
+             ACE_HAS_PENTIUM) ||
           ACE_HAS_HI_RES_TIMER */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -60,7 +60,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 #endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
-             ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER)  ||
+             ACE_HAS_PENTIUM)  ||
           ACE_HAS_HI_RES_TIMER */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -82,9 +82,7 @@ ACE_High_Res_Timer::get_cpuinfo ()
   // the BogoMips, as described in the BogoMips mini-HOWTO.  Note that
   // this code assumes an order to the /proc/cpuinfo contents.  The
   // BogoMips rating had better come after CPU type and model info.
-#if !defined (__alpha__)
   bool supported = false;
-#endif /* __alpha__ */
 
   FILE *cpuinfo = ACE_OS::fopen (ACE_TEXT ("/proc/cpuinfo"),
                                  ACE_TEXT ("r"));
@@ -97,22 +95,6 @@ ACE_High_Res_Timer::get_cpuinfo ()
 
       while (ACE_OS::fgets (buf, sizeof buf, cpuinfo))
         {
-#if defined (__alpha__)
-          ACE_UINT32 whole;
-          ACE_UINT32 fractional;
-          if (::sscanf (buf,
-                        "BogoMIPS : %d.%d\n",
-                        &whole,
-                        &fractional) == 2
-              || ::sscanf (buf,
-                           "bogomips : %d.%d\n",
-                           &whole,
-                           &fractional) == 2)
-            {
-              scale_factor = whole;
-              break;
-            }
-#else
           double mhertz = 1;
           double bmips = 1;
           char arg[128];
@@ -173,7 +155,6 @@ ACE_High_Res_Timer::get_cpuinfo ()
 #endif /* 0 */
               break;
             }
-#endif /* __alpha__ */
         }
 
       // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n")));
@@ -189,7 +170,7 @@ ACE_High_Res_Timer::global_scale_factor_type
 ACE_High_Res_Timer::global_scale_factor ()
 {
 #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \
-     defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \
+     defined (ACE_HAS_PENTIUM)) && \
     !defined (ACE_HAS_HI_RES_TIMER) && \
     (defined (ACE_WIN32) || \
      defined (ghs) || defined (__GNUG__) || \
@@ -244,7 +225,7 @@ ACE_High_Res_Timer::global_scale_factor ()
     }
 
 #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
-           ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) && \
+           ACE_HAS_PENTIUM) && \
           ! ACE_HAS_HI_RES_TIMER &&
           ((WIN32 && ! WINCE) || ghs || __GNUG__) */
 
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 2214a6c873d..0e265607231 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -294,22 +294,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 # endif
 
   return now;
-#elif defined (ACE_LINUX) && defined (ACE_HAS_ALPHA_TIMER)
-  // NOTE:  alphas only have a 32 bit tick (cycle) counter.  The rpcc
-  // instruction actually reads 64 bits, but the high 32 bits are
-  // implementation-specific.  Linux and Digital Unix, for example,
-  // use them for virtual tick counts, i.e., taking into account only
-  // the time that the process was running.  This information is from
-  // David Mosberger's article, see comment below.
-  ACE_UINT32 now;
-
-  // The following statement is based on code published by:
-  // Mosberger, David, "How to Make Your Applications Fly, Part 1",
-  // Linux Journal Issue 42, October 1997, page 50.  It reads the
-  // high-res tick counter directly into the memory variable.
-  asm volatile ("rpcc %0" : "=r" (now) : : "memory");
-
-  return now;
 #elif defined (ACE_HAS_POWERPC_TIMER) && (defined (ghs) || defined (__GNUG__))
   // PowerPC w/ GreenHills or g++.
 
diff --git a/ACE/ace/README b/ACE/ace/README
index f63ed42ae7a..39e90c99c58 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -215,9 +215,6 @@ ACE_HAS_ALLOCA                          Compiler/platform supports
                                         alloca()
 ACE_HAS_ALLOCA_H                        Compiler/platform has
                                         <alloca.h>
-ACE_HAS_ALPHA_TIMER                     CPU is an Alpha, with the rpcc
-                                        instruction to read the tick timer.
-                                        Limited to 32 bits, so not recommended.
 ACE_HAS_AUTOMATIC_INIT_FINI             Compiler/platform correctly
                                         calls init()/fini() for shared
                                         libraries
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 23e0f579594..87af053f04c 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -184,7 +184,7 @@
 #  define ACE_HAS_STRBUF_T
 #endif
 
-#if defined (__ia64) || defined(__alpha) || defined (__x86_64__) || defined(__powerpc64__) || (defined(__mips__) && defined(__LP64__)) || defined (__aarch64__)
+#if defined (__ia64) || defined (__x86_64__) || defined(__powerpc64__) || (defined(__mips__) && defined(__LP64__)) || defined (__aarch64__)
 // On 64 bit platforms, the "long" type is 64-bits.  Override the
 // default 32-bit platform-specific format specifiers appropriately.
 #  define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu"
diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp
index e7449c740c0..7b7d2828a43 100644
--- a/ACE/tests/Auto_Event_Test.cpp
+++ b/ACE/tests/Auto_Event_Test.cpp
@@ -23,7 +23,7 @@
 
 // msec that times are allowed to differ before test fails.
 #if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \
-    defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER) || \
+    defined (ACE_HAS_PENTIUM) || \
     defined (ACE_HAS_POWERPC_TIMER)
 # define ACE_ALLOWED_SLACK 100
 #else  /* don't have a high-res timer */
diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp
index 1308cb7ecdb..d43318c96aa 100644
--- a/ACE/tests/Semaphore_Test.cpp
+++ b/ACE/tests/Semaphore_Test.cpp
@@ -21,7 +21,7 @@
 
 // msec that times are allowed to differ before test fails.
 #if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \
-    defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER) || \
+    defined (ACE_HAS_PENTIUM) || \
     defined (ACE_HAS_POWERPC_TIMER)
 # define ACE_ALLOWED_SLACK 100
 #else  /* don't have a high-res timer */
diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp
index b53b5df8a02..65e88b1e611 100644
--- a/TAO/tests/Time_Policy/main.cpp
+++ b/TAO/tests/Time_Policy/main.cpp
@@ -25,7 +25,6 @@
      defined (ACE_WIN32) || \
      (defined (ghs) && defined (ACE_HAS_PENTIUM)) || \
      ((defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)) || \
-     (defined (ACE_LINUX) && defined (ACE_HAS_ALPHA_TIMER)) || \
      (defined (ACE_HAS_POWERPC_TIMER) && (defined (ghs) || defined (__GNUG__))) || \
      (defined (ACE_HAS_CLOCK_GETTIME) && defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)))