summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 15:09:13 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 15:09:13 +0100
commit2815569ae3ec537e4bdf219761b08ecfe1a6b039 (patch)
treec83163a92edbf99be21011905fde2d431f01bd5b
parent78006062ece6be12eba3e81471961c74743ba071 (diff)
downloadATCD-2815569ae3ec537e4bdf219761b08ecfe1a6b039.tar.gz
Removed support for CE GCC, not maintained for a long time, closes #1387
* ACE/ace/config-win32-cegcc.h: * ACE/include/makeinclude/platform_cegcc.GNU: Deleted. * ACE/ace/config-g++-common.h: * ACE/ace/config-win32.h:
-rw-r--r--ACE/ace/config-g++-common.h4
-rw-r--r--ACE/ace/config-win32-cegcc.h105
-rw-r--r--ACE/ace/config-win32.h2
-rw-r--r--ACE/include/makeinclude/platform_cegcc.GNU61
4 files changed, 2 insertions, 170 deletions
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 50daf671852..1038c3168ad 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -89,7 +89,7 @@
// Take advantage of g++ visibility attributes to generate
// improved shared library binaries.
-#if !defined (__MINGW32__) && !defined (ACE_HAS_CEGCC)
+#if !defined (__MINGW32__)
# if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
# undef ACE_HAS_CUSTOM_EXPORT_MACROS
@@ -133,7 +133,7 @@
# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
# endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
-#endif /* !__MINGW32__ && !ACE_HAS_CEGCC */
+#endif /* !__MINGW32__ */
#if defined (ACE_HAS_THREADS)
# if defined (__powerpc__)
diff --git a/ACE/ace/config-win32-cegcc.h b/ACE/ace/config-win32-cegcc.h
deleted file mode 100644
index f1480b2a5f1..00000000000
--- a/ACE/ace/config-win32-cegcc.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// -*- C++ -*-
-//
-// The following configuration file is designed to work for win32
-// platforms using gcc/g++ with mingw32 (http://www.mingw.org).
-//
-
-#ifndef ACE_CONFIG_WIN32_CEGCC_H
-#define ACE_CONFIG_WIN32_CEGCC_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-# error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#define ACE_CC_PREPROCESSOR "cpp"
-#define ACE_CC_PREPROCESOR_ARGS ""
-
-#if !defined (ACE_HAS_CEGCC)
-# error You do not seem to be using cegcc
-#endif
-
-// We trust the user: He must have used -mpentiumpro or -mpentium
-// if that is what he wants.
-#if defined(pentiumpro) || defined(pentium)
-# define ACE_HAS_PENTIUM
-#endif
-
-#include "ace/config-g++-common.h"
-
-#include /**/ <cegcc.h>
-#include /**/ <w32api.h>
-#include /**/ <_mingw.h>
-
-#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15))
-# undef ACE_LACKS_USECONDS_T
-#endif
-
-#define ACE_HAS_USER_MODE_MASKS
-
-#define ACE_HAS_SSIZE_T
-#undef ACE_LACKS_STRUCT_DIR
-#undef ACE_LACKS_OPENDIR
-#undef ACE_LACKS_CLOSEDIR
-#undef ACE_LACKS_READDIR
-#undef ACE_LACKS_TELLDIR
-#undef ACE_LACKS_SEEKDIR
-#undef ACE_LACKS_REWINDDIR
-
-#undef ACE_HAS_WTOF
-
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_TERMIOS_H
-#define ACE_LACKS_NETINET_TCP_H
-#define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_STRPTIME
-#define ACE_LACKS_POLL_H
-#define ACE_LACKS_REGEX_H
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_PWD_H
-#define ACE_LACKS_SEMAPHORE_H
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_SYS_SELECT_H
-#define ACE_LACKS_SYS_RESOURCE_H
-#define ACE_LACKS_SYS_WAIT_H
-#define ACE_LACKS_DLFCN_H
-#define ACE_LACKS_SYS_MMAN_H
-#define ACE_LACKS_SYS_UIO_H
-#define ACE_LACKS_SYS_SOCKET_H
-#define ACE_LACKS_NETINET_IN_H
-#define ACE_LACKS_NETDB_H
-#define ACE_LACKS_NET_IF_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_SYS_IOCTL_H
-#define ACE_LACKS_PDH_H
-#define ACE_LACKS_PDHMSG_H
-#define ACE_HAS_NONCONST_WCSDUP
-#define ACE_HAS_WINSOCK2_GQOS
-#define ACE_LACKS_CORRECT_ISWPRINT_TAB
-
-//Changes to compile on CE gcc.
-#undef ACE_HAS_TYPES_H
-#define ACE_LACKS_ERRNO_H
-#undef ACE_LACKS_DEV_T
-#define ACE_LACKS_ISCTYPE
-#define ACE_HAS_NONCONST_WFDOPEN
-#undef ACE_HAS_WTOI
-#undef ACE_HAS_WTOL
-
-#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d"
-#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u"
-#define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS)
-
-#define ACE_Proper_Export_Flag __declspec (dllexport)
-#define ACE_Proper_Import_Flag __declspec (dllimport)
-#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T
-#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>;
-#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T
-#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE <CLASS, LOCK>;
-
-#define ACE_DLL_PREFIX ACE_TEXT ("lib")
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_CEGCC_H */
diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h
index 3217c2b7894..3b541a6cdfc 100644
--- a/ACE/ace/config-win32.h
+++ b/ACE/ace/config-win32.h
@@ -33,8 +33,6 @@
# include "ace/config-win32-borland.h"
#elif defined (_MSC_VER)
# include "ace/config-win32-msvc.h"
-#elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32
-# include "ace/config-win32-cegcc.h"
#elif defined (__MINGW32__)
# if defined (__MINGW64_VERSION_MAJOR)
# include "ace/config-win32-mingw64.h"
diff --git a/ACE/include/makeinclude/platform_cegcc.GNU b/ACE/include/makeinclude/platform_cegcc.GNU
deleted file mode 100644
index 6456f9b1c08..00000000000
--- a/ACE/include/makeinclude/platform_cegcc.GNU
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# This file should allow to build ACE for Windows CE with GCC tools.
-#
-# Don't forget to define the ACE_ROOT environment variable!
-#
-
-#
-# Chose your target CPU (by default we set it to ARM. In your
-# platform_macros.GNU file you can override this to pentium, i486 or i386
-#
-TCPU ?= arm
-
-cygwin32 = 1
-
-# Cygwin doesn't have rwho
-rwho = 0
-
-# Cygwin doesn't allow to add the version number of ACE to the dll name
-# because fe ace.dll.5.2.3 isn't a valid dll name
-versioned_so=0
-
-ACE_CE_VER ?= 0x600
-
-qos ?= 1
-
-# Disable auto-import warnings. The Cygwin linker has a problem with imports
-# See https://sourceforge.net/tracker/?func=detail&atid=102435&aid=683455&group_id=2435
-# for the details why to do this.
-LDFLAGS += -Wl,--enable-auto-import
-CPPFLAGS += -DACE_HAS_CEGCC
-
-CPPFLAGS += -D_WIN32_WCE=$(ACE_CE_VER) -DUNICODE -D_UNICODE -D_WINDOWS -DCEVER -DWIN32 -D_WINSOCKAPI_
-RCFLAGS += -D_WIN32_WCE=$(ACE_CE_VER) -DUNICODE -D_UNICODE -D_WINDOWS -DCEVER -DWIN32 -D_WINSOCKAPI_ -D_WIN32_IE=0x0500
-
-cpumodelflag=0
-tunemodelflag=0
-
-CROSS_COMPILE ?= i386-mingw32ce-
-
-LIBS += -lcoredll -lmingw32 -lmingwex -lws2 -lsupc++ -liphlpapi
-
-no_hidden_visibility ?= 1
-qos ?= 1
-
-ifdef COMSPEC
- HOST_EXE_EXT = .exe
-endif
-
-ifneq (,$(HOST_ROOT))
-TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
-TAO_IDL = $(HOST_ROOT)/bin/tao_idl$(HOST_EXE_EXT)
-TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT)
-TAO_IDL_DEP = $(TAO_IDL)
-TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
-else
-# Append the HOST_EXE_EXT if it's not already there
-TAO_IDL_DEP = $(TAO_IDL:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
-TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2:$(HOST_EXE_EXT)=)$(HOST_EXE_EXT)
-endif
-
-include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU