Merge pull request #2029 from jwillemsen/jwi-rtemscleanup

Removed RTEMS support

16 files changed, 18 insertions, 494 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index c7366c4cce3..46f8f59d794 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -184,7 +184,7 @@ document</a>.</p><p>
         MinGW, Microsoft Visual C++, GCC,
         Cygwin, VxWorks 6.x (kernel and rtp),
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
-        SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
+        SuSE Linux on IA32/EM64T/IA64, QNX, LynxOS,
         and Android.
         The Intel C++ compiler is supported on
         Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX.
@@ -284,7 +284,6 @@ The following sections explain how to build ACE on:
 <li><a href="#win32">Windows (including MinGW and Cygwin)</a></li>
 <li><a href="#vxworks">VxWorks</a></li>
 <li><a href="#android">Android</a></li>
-<li><a href="#rtems">RTEMS</a></li>
 </ul>
 
 <h2>General Rules</h2>
@@ -2432,24 +2431,6 @@ libraries.
       Under the current version of QNX RTP ACE fails if compiled with
       inline=0 . </p><p>
 
-  </p></li><li><strong><a name="rtems">RTEMS</a></strong><p>
-
-      The support for RTEMS has been revived from version x.5.4. This version
-      was the first version that build again out of the box on RTEMS. Compilation
-      and testing was done for RTEMS with and without networking support. The
-      ACE GNU makefiles do automatically detect whether networking support
-      is available or not.
-
-      Besides the standard config.h/platform_macros.GNU file you will need
-      to set <code>RTEMS_MAKEFILE_PATH</code> to point to the location
-      of your RTEMS installation, see below for an example.</p>
-      <p><code>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP</code></p>
-      <p>
-      When building without network support you will need the ace_for_tao
-      subsetting functionality enabled. For this add <code>ace_for_tao = 1</code>
-      to your <code>bin/MakeProjectCreator/config</code> file and regenerate the
-      GNU makefiles as described <a href="#power">here</a>.</p><p>
-
   </p></li><li><strong>PharLap ETS</strong><p>
 
       ACE has been ported to Ardence's
diff --git a/ACE/NEWS b/ACE/NEWS
index b61c482db7f..5b60c3b2f34 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,7 +1,7 @@
 USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0
 =====================================================
 
-. Removed support for Windows CE, OpenVMS and HPUX
+. Removed support for Windows CE, OpenVMS, HPUX, and RTEMS
 
 USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11
 ======================================================
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index 19aa67f5026..3d592c526f7 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -134,10 +134,9 @@ inline char *ace_cuserid(char *user)
 #endif /* !ACE_LACKS_CUSERID && !ACE_HAS_ALT_CUSERID && ... */
 
 # if defined (ACE_LACKS_FILELOCKS)
-#   if ! defined (ACE_VXWORKS) && ! defined (ACE_HAS_RTEMS) && !defined (INTEGRITY)
+#   if ! defined (ACE_VXWORKS) && !defined (INTEGRITY)
 // VxWorks defines struct flock in sys/fcntlcom.h.  But it doesn't
-// appear to support flock ().  RTEMS defines struct flock but
-// currently does not support locking.
+// appear to support flock ().
 struct flock
 {
   short l_type;
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 7bca51f6aba..7c7ac47e56d 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -83,7 +83,7 @@ ACE_OS::getpagesize ()
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return (long) sys_info.dwPageSize;
-#elif defined (_SC_PAGESIZE) && !defined (ACE_HAS_NOTSUP_SC_PAGESIZE)
+#elif defined (_SC_PAGESIZE)
   return ::sysconf (_SC_PAGESIZE);
 #elif defined (ACE_HAS_GETPAGESIZE)
   return ::getpagesize ();
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 54726aa0265..873e4e0ecb4 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -27,10 +27,6 @@
 
 # if !defined (ACE_DOESNT_DEFINE_MAIN)
 
-# if defined (ACE_HAS_RTEMS)
-extern char* rtems_progname;
-# endif /* ACE_HAS_RTEMS */
-
 #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__)
 #  include <resolvLib.h>
 #endif
@@ -101,25 +97,6 @@ ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 int \
 ace_main_i
 
-#   elif defined (ACE_HAS_RTEMS)
-
-#     define main \
-ACE_MAIN (int, char *[]); /* forward decl to gobble up the 'int' if there is one */ \
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
-int ace_os_main_i (int, char *[]); \
-ACE_END_VERSIONED_NAMESPACE_DECL \
-int \
-ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
-{ \
-  if ((argc > 0) && argv && argv[0]) \
-    rtems_progname = argv[0]; \
-  else \
-    rtems_progname = "RTEMS"; \
-  return ace_os_main_i (argc, argv); /* what the user calls "main" */ \
-} \
-int \
-ace_main_i
-
 #   elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__)
 
 #     define main \
diff --git a/ACE/ace/README b/ACE/ace/README
index f2db8a409f6..d041eb53623 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -847,9 +847,6 @@ ACE_LACKS_RENAME                        Platform lacks rename().
 ACE_LACKS_RLIMIT                        Platform/compiler lacks
                                         {get,set}rlimit() function
                                         (e.g., VxWorks)
-ACE_LACKS_RLIMIT_PROTOTYPE              Platform/compiler lacks
-                                        {get,set}rlimit() prototypes
-                                        (e.g., Tandem)
 ACE_LACKS_READDIR_R                     Platform uses ACE_HAS_DIRENT
                                         but does not have readdir_r
                                         ().
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
deleted file mode 100644
index 389169d7a32..00000000000
--- a/ACE/ace/Rtems_init.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-#if defined (ACE_HAS_RTEMS)
-
-#define RTEMS_BSP_NETWORK_DRIVER_NAME "ne1"
-#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256
-
-#define CONFIGURE_MAXIMUM_POSIX_THREADS 100
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300
-#define CONFIGURE_MAXIMUM_POSIX_KEYS 100
-#define CONFIGURE_MAXIMUM_POSIX_TIMERS 100
-#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 10
-#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 300
-#define CONFIGURE_POSIX_INIT_THREAD_TABLE
-#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT Init
-#define CONFIGURE_MEMORY_FOR_POSIX (10*1024)
-#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (10*1024)
-
-#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024)
-
-#define CONFIGURE_MICROSECONDS_PER_TICK 10000
-
-#define CONFIGURE_MAXIMUM_SEMAPHORES    100
-#define CONFIGURE_MAXIMUM_TASKS         100
-#define CONFIGURE_INIT_TASK_PRIORITY 120
-#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
-                                           RTEMS_NO_TIMESLICE | \
-                                           RTEMS_NO_ASR | \
-                                           RTEMS_INTERRUPT_LEVEL(0))
-
-#include <bsp.h>
-
-char *rtems_progname;
-
-#define CONFIGURE_INIT
-
-rtems_task Init (rtems_task_argument argument);
-
-#include <confdefs.h>
-
-#include <stdio.h>
-
-#if !defined (ACE_LACKS_NETWORKING)
-
-#include <rtems/rtems_bsdnet.h>
-
-/*
- * Network configuration
- *
- ************************************************************
- * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION     *
- * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
- ************************************************************
- */
-
-#ifndef _RTEMS_NETWORKCONFIG_H_
-#define _RTEMS_NETWORKCONFIG_H_
-
-#ifndef RTEMS_BSP_NETWORK_DRIVER_NAME
-#warning "RTEMS_BSP_NETWORK_DRIVER_NAME is not defined"
-#define RTEMS_BSP_NETWORK_DRIVER_NAME "no_network1"
-#endif
-
-#ifndef RTEMS_BSP_NETWORK_DRIVER_ATTACH
-#warning "RTEMS_BSP_NETWORK_DRIVER_ATTACH is not defined"
-#define RTEMS_BSP_NETWORK_DRIVER_ATTACH 0
-#endif
-
-/* #define RTEMS_USE_BOOTP */
-
-#include <bsp.h>
-
-/*
- * Define RTEMS_SET_ETHERNET_ADDRESS if you want to specify the
- * Ethernet address here.  If RTEMS_SET_ETHERNET_ADDRESS is not
- * defined the driver will choose an address.
- */
-#define RTEMS_SET_ETHERNET_ADDRESS
-#if (defined (RTEMS_SET_ETHERNET_ADDRESS))
-static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 };
-
-#endif
-
-#define RTEMS_USE_LOOPBACK
-
-#ifdef RTEMS_USE_LOOPBACK
-/*
- * Loopback interface
- */
-int rtems_bsdnet_loopattach(struct rtems_bsdnet_ifconfig *, int);
-
-#ifdef RTEMS_USE_LOOPBACK_ONLY
-static struct rtems_bsdnet_ifconfig netdriver_config = {
-#else
-static struct rtems_bsdnet_ifconfig loopback_config = {
-#endif
-  "lo0",                    /* name */
-  rtems_bsdnet_loopattach,  /* attach function */
-  0,                        /* link to next interface */
-  "127.0.0.1",              /* IP address */
-  "255.0.0.0",              /* IP net mask */
-};
-#endif
-
-/*
- * Default network interface
- */
-#ifndef RTEMS_USE_LOOPBACK_ONLY
-static struct rtems_bsdnet_ifconfig netdriver_config = {
-  RTEMS_BSP_NETWORK_DRIVER_NAME,    /* name */
-  RTEMS_BSP_NETWORK_DRIVER_ATTACH,  /* attach function */
-
-#ifdef RTEMS_USE_LOOPBACK
-  &loopback_config,  /* link to next interface */
-#else
-  0,                 /* No more interfaces */
-#endif
-
-#if (defined (RTEMS_USE_BOOTP))
-  0,        /* BOOTP supplies IP address */
-  0,        /* BOOTP supplies IP net mask */
-#else
-  "XXX.YYY.ZZZ.XYZ",   /* IP address */
-  "255.255.255.0",     /* IP net mask */
-#endif /* !RTEMS_USE_BOOTP */
-
-#if (defined (RTEMS_SET_ETHERNET_ADDRESS))
-  ethernet_address,    /* Ethernet hardware address */
-#else
-  0,                   /* Driver supplies hardware address */
-#endif
-  0                    /* Use default driver parameters */
-};
-#endif
-
-/*
- * Network configuration
- */
-struct rtems_bsdnet_config rtems_bsdnet_config = {
-  &netdriver_config,
-
-#if (defined (RTEMS_USE_BOOTP))
-  rtems_bsdnet_do_bootp,
-#else
-  0,
-#endif
-
-  0,      /* Default network task priority */
-  0,      /* Default mbuf capacity */
-  0,      /* Default mbuf cluster capacity */
-
-#if (!defined (RTEMS_USE_BOOTP))
-  "rtems_host",       /* Host name */
-  "nodomain.com",     /* Domain name */
-  "XXX.YYY.ZZZ.1",    /* Gateway */
-  "XXX.YYY.ZZZ.1",    /* Log host */
-  {"XXX.YYY.ZZZ.1" }, /* Name server(s) */
-  {"XXX.YYY.ZZZ.1" }, /* NTP server(s) */
-
-  /*
-  *  A real example -- DO NOT USE THIS YOURSELF!!!
-  */
-
-#if 0
-  "dy4",             /* Host name */
-  "NOT_oarcorp.com", /* Domain name */
-  "192.168.1.2",     /* Gateway */
-  "192.168.1.2",     /* Log host */
-  {"192.168.1.2" },  /* Name server(s) */
-  {"192.168.1.2" },  /* NTP server(s) */
-#endif
-#endif /* !RTEMS_USE_BOOTP */
-
-};
-
-/*
- * For TFTP test application
- */
-#if (defined (RTEMS_USE_BOOTP))
-#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST"
-#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE"
-#else
-#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ"
-#define RTEMS_TFTP_TEST_FILE_NAME "tftptest"
-#endif
-
-#endif /* _RTEMS_NETWORKCONFIG_H_ */
-
-#endif /* ACE_LACKS_NETWORKING */
-
-extern int main (int, char *[]);
-
-/*
- * RTEMS Startup Task
- */
-rtems_task
-Init (rtems_task_argument not_used)
-{
-  int retval = 0;
-#if !defined (ACE_LACKS_NETWORKING)
-  retval = rtems_bsdnet_initialize_network ();
-#endif /* ACE_LACKS_NETWORKING */
-  if (retval == 0)
-    {
-      retval = main (0, 0);
-    }
-}
-
-#elif !defined (__GNUC__) && !defined (__INTEL_COMPILER)
-/* Make compilers stop complaining about an empty translation unit */
-static int shut_up_compiler = 0;
-#endif /* ACE_HAS_RTEMS */
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index 8c03e610fb0..d23422f4225 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -419,8 +419,8 @@ ACE_SOCK_Dgram::send (const iovec iov[],
 
   // Determine the total length of all the buffers in <iov>.
   for (i = 0; i < n; i++)
-#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS))
-    // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go
+#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX))
+    // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go
     // ahead and try the if, it will emit a warning.
     if (iov[i].iov_len < 0)
       return -1;
@@ -480,8 +480,8 @@ ACE_SOCK_Dgram::recv (iovec iov[],
   ACE_UNUSED_ARG (to_addr);
 
   for (i = 0; i < n; i++)
-#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS))
-    // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go
+#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX))
+    // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go
     // ahead and try the if, it will emit a warning.
     if (iov[i].iov_len < 0)
       return -1;
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index a989f67efe6..b2081e7a12f 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -826,7 +826,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
   return get_ip_interfaces_getifaddrs (count, addrs);
 #elif defined (_AIX)
   return get_ip_interfaces_aix (count, addrs);
-#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   // Call specific routine as necessary.
@@ -938,7 +938,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
             }
         }
 
-#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__)
+#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__)
       ++pcur;
 #else
       if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -950,7 +950,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
            pcur = (struct ifreq *)
                (pcur->ifr_addr.sa_len + (caddr_t) &pcur->ifr_addr);
         }
-#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */
+#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */
     }
 
 # if defined (ACE_HAS_IPV6) && !defined (ACE_LACKS_FSCANF)
@@ -1036,7 +1036,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
 # endif /* SIOCGLIFNUM */
 return 0;
 
-#elif (defined (__unix) || defined (__unix__) || defined (ACE_HAS_RTEMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING)
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
   // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
   // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
@@ -1102,7 +1102,7 @@ return 0;
         break;
 
       ++if_count;
-# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__)
+# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__)
       ++p_ifs;
 # else
      if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -1114,7 +1114,7 @@ return 0;
           p_ifs = (struct ifreq *)
               (p_ifs->ifr_addr.sa_len + (caddr_t) &p_ifs->ifr_addr);
        }
-# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)  && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */
+# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */
     }
 
 #if defined (ACE_HAS_ALLOC_HOOKS)
@@ -1155,7 +1155,7 @@ ACE::get_handle ()
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_HAS_RTEMS)
+#elif defined (__unix) || defined (__unix__) || defined (_AIX) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600))
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: AIX, SunOS 4.x
   handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0);
 #endif /* sparc */
diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
index 6f7aab97019..df4d022fbdd 100644
--- a/ACE/ace/ace.mpc
+++ b/ACE/ace/ace.mpc
@@ -206,7 +206,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Recursive_Thread_Mutex.cpp
     Recyclable.cpp
     Registry.cpp
-    Rtems_init.c
     RW_Mutex.cpp
     RW_Process_Mutex.cpp
     RW_Thread_Mutex.cpp
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 723ed4c27b6..acb98a071af 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -150,7 +150,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Reactor_Timer_Interface.cpp
     Read_Buffer.cpp
     Recursive_Thread_Mutex.cpp
-    Rtems_init.c
     RW_Mutex.cpp
     RW_Thread_Mutex.cpp
     Sched_Params.cpp
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
deleted file mode 100644
index e74a3faa463..00000000000
--- a/ACE/ace/config-rtems.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- C -*- */
-/* The following configuration file is designed to work for RTEMS
-   platforms using GNU C.
-*/
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-// Needed to make some prototypes visible.
-// #if ! defined (_GNU_SOURCE)
-// #define _GNU_SOURCE
-// #endif /* ! _GNU_SOURCE */
-
-// First the machine specific part
-//   There are no known port specific issues with the RTEMS port of ACE.
-//   XXX Pentium and PowerPC have high res timer support in ACE.
-
-// Then the compiler specific parts
-#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-#else  /* ! __GNUG__  */
-#  ifdef __cplusplus  /* Let it slide for C compilers. */
-#   error unsupported compiler in ace/config-rtems.h
-#  endif  /* __cplusplus */
-#endif /* ! __GNUG__ */
-
-#include "ace/config-posix.h"
-
-// Completely common part :-)
-
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-
-#define ACE_LACKS_ALPHASORT
-#define ACE_LACKS_REGEX_H
-#define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_DLFCN_H
-#define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_STRINGS_H
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_SETEGID
-#define ACE_LACKS_SETEUID
-#define ACE_LACKS_POLL_H
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_LACKS_STRCASECMP
-#define ACE_LACKS_MKSTEMP
-#define ACE_LACKS_STRDUP
-#define ACE_LACKS_STRTOK_R
-#define ACE_LACKS_REALPATH
-#define ACE_LACKS_TEMPNAM
-#define ACE_LACKS_TZSET
-
-// Temporarily, enabling this results in compile errors with
-// rtems 4.6.6.
-#define ACE_LACKS_WCHAR_H
-
-#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
-#endif
-
-#if ACE_MT_SAFE
-# define ACE_HAS_THREADS
-# define ACE_HAS_PTHREADS
-# define ACE_HAS_THREAD_SPECIFIC_STORAGE
-# define ACE_HAS_PTHREAD_SCHEDPARAM
-# define ACE_LACKS_THREAD_PROCESS_SCOPING
-#else
-# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#endif
-
-#define ACE_HAS_ALT_CUSERID
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CLOCK_SETTIME
-#define ACE_HAS_DIRENT
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_MSG
-#define ACE_HAS_MT_SAFE_MKTIME
-#define ACE_HAS_NONCONST_READV
-#define ACE_HAS_GETPAGESIZE
-#define ACE_HAS_POSIX_SEM
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SIGACTION_CONSTP2
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_SIGSUSPEND
-#define ACE_HAS_SSIZE_T
-#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
-#define ACE_HAS_SYS_FILIO_H
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_LACKS_EXEC
-#define ACE_LACKS_FILELOCKS
-#define ACE_LACKS_FORK
-#define ACE_LACKS_GETPGID
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_LACKS_MADVISE
-#define ACE_LACKS_MMAP
-#define ACE_LACKS_MPROTECT
-#define ACE_LACKS_MSYNC
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_READLINK
-#define ACE_LACKS_READV
-#define ACE_LACKS_RLIMIT
-#define ACE_LACKS_RLIMIT_PROTOTYPE
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SBRK
-#define ACE_LACKS_SEMBUF_T
-#define ACE_LACKS_SETREUID
-#define ACE_LACKS_SETREUID_PROTOTYPE
-#define ACE_LACKS_SETREGID
-#define ACE_LACKS_SETREGID_PROTOTYPE
-#define ACE_LACKS_STRPTIME
-#define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SI_ADDR
-#define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_SYSV_SHMEM
-#define ACE_LACKS_SYSCALL
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_HAS_NONCONST_WRITEV
-#define ACE_LACKS_WRITEV
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
-#define ACE_NEEDS_SCHED_H
-#define ACE_HAS_POSIX_NONBLOCK
-#define ACE_HAS_TERMIOS
-
-// rtems 4.7 or higher
-#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6)
-# define ACE_HAS_UALARM
-#else
-# define ACE_HAS_NOTSUP_SC_PAGESIZE
-# define ACE_LACKS_SUSECONDS_T
-# define ACE_LACKS_INTPTR_T
-# undef ACE_HAS_SHM_OPEN
-# undef ACE_HAS_AIO_CALLS
-#endif
-
-// __RTEMS_REVISION__ could also be used but this is broken according
-// to the rtems people
-
-#if !defined (_POSIX_REALTIME_SIGNALS)
-# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#endif
-
-#if defined (ACE_LACKS_NETWORKING)
-# include "ace/config-posix-nonetworking.h"
-#endif
-
-#endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index 574cc6cbff6..679a1944aab 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -135,7 +135,7 @@ extern "C"
 
 #if defined (ACE_VXWORKS)
 #  define ACE_NSIG (_NSIGS + 1)
-#elif defined (__Lynx__) || defined (ACE_HAS_RTEMS)
+#elif defined (__Lynx__)
 #  define ACE_NSIG (NSIG + 1)
 #else
    // All other platforms set NSIG to one greater than the
@@ -157,9 +157,6 @@ extern "C"
 #elif defined (INTEGRITY)
    using ACE_SignalHandler = void (*)();
    using ACE_SignalHandlerV = void (*)(int);
-#elif defined (ACE_HAS_RTEMS)
-   using ACE_SignalHandler = void (*)();
-   using ACE_SignalHandlerV = void (*)();
 #else /* This is necessary for some older broken version of cfront */
 #  if defined (SIG_PF)
 #    define ACE_SignalHandler SIG_PF
diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h
index 437e2d6e49d..18b86d6809a 100644
--- a/ACE/ace/os_include/sys/os_resource.h
+++ b/ACE/ace/os_include/sys/os_resource.h
@@ -59,11 +59,6 @@ extern "C"
    };
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_LACKS_RLIMIT_PROTOTYPE)
-  int getrlimit (int resource, struct rlimit *rlp);
-  int setrlimit (int resource, const struct rlimit *rlp);
-#endif /* ACE_LACKS_RLIMIT_PROTOTYPE */
-
 #if defined (ACE_HAS_PRUSAGE_T)
    typedef prusage_t ACE_Rusage;
 #elif defined (ACE_HAS_GETRUSAGE)
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index dffe96895bd..eb5a9820feb 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -53,7 +53,7 @@ typedef double ACE_timer_t;
 
 #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
    typedef off_t ACE_LOFF_T;
-#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__)
+#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__)
    typedef off_t ACE_LOFF_T;
 #elif defined (AIX) || defined (__QNX__)
    typedef off64_t ACE_LOFF_T;
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
deleted file mode 100644
index 2f61e6a647e..00000000000
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- Makefile -*-
-
-# RTEMS 4.6.6 and later with GNU g++.
-
-CROSS-COMPILE = 1
-
-debug ?= 1
-optimize ?= 1
-threads ?= 1
-
-shared_libs =
-static_libs = 1
-rwho = 0
-
-ifneq (,$(HOST_ROOT))
-  TAO_IDL = $(HOST_ROOT)/bin/tao_idl
-  TAO_IDL_DEP = $(TAO_IDL)
-endif
-
-ifeq (,$(RTEMS_MAKEFILE_PATH))
-  default:
-	@ERROR: you must set your RTEMS_MAKEFILE_PATH environment variable
-endif # RTEMS_MAKEFILE_PATH
-
-ifeq (,$(PERL_PATH))
-  PERL_PATH = perl
-endif # ! PERL_PATH
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_MAKEFILE_PATH)/make/target.cfg
-
-# Test for template instantiation.
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
-ifeq (no,$(RTEMS_HAS_NETWORKING))
- CFLAGS += -DACE_LACKS_NETWORKING
- CCFLAGS += -DACE_LACKS_NETWORKING
-endif
-
-CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
-DCFLAGS         += -g
-DCCFLAGS        += -g
-DLD             = $(LD)
-INCLDIRS        +=
-
-LD              = $(CXX)
-LDFLAGS         += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib -Wl,-Ttext,0x00100000
-OCFLAGS         += -O
-PIC             =