diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:07:49 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:07:49 +0000 |
commit | 93c2d405001d7bd343e608fe14edb4e7d3dc6f66 (patch) | |
tree | ffae685fc795dd3ede75e10cbde6f167da050715 /ACE/include | |
parent | 45eefc686b90b6fd44a9505510de3329f122a1f2 (diff) | |
download | ATCD-93c2d405001d7bd343e608fe14edb4e7d3dc6f66.tar.gz |
Thu Sep 9 09:01:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ACE.cpp:
* ace/ACE_export.h:
* ace/ETCL/ETCL_y.cpp:
* ace/INET_Addr.cpp:
* ace/Log_Msg.cpp:
* ace/OS.inl:
* ace/OS_NS_Thread.h:
* ace/OS_NS_Thread.inl:
* ace/OS_NS_Thread.cpp:
* ace/OS_NS_ctype.cpp:
* ace/OS_NS_netdb.inl:
* ace/OS_NS_pwd.inl:
* ace/OS_NS_stdlib.inl:
* ace/OS_NS_time.inl:
* ace/OS_NS_time.cpp:
* ace/POSIX_CB_Proactor.cpp:
* ace/POSIX_Proactor.cpp:
* ace/config-cxx-common.h:
* ace/config-doxygen.h:
* ace/config-integritySCA.h:
* ace/config-lynxos.h:
* ace/config-macros.h:
* ace/config-openvms.h:
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
* ace/config-vxworks6.4.h:
* ace/config-win32-common.h:
* ace/os_include/os_pthread.h:
* ace/os_include/os_pwd.h:
* ace/os_include/os_signal.h:
* ace/os_include/os_stdlib.h:
* ace/os_include/os_time.h:
* ace/os_include/sys/os_types.h:
Removed Tru64, Irix, Unixware, and SCO support
* debian/debian.rules:
Improved
* examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h:
* examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h:
* examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h:
* examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h:
* examples/QOS/Simple/Receiver_QoS_Event_Handler.h:
* examples/QOS/Simple/Sender_QoS_Event_Handler.h:
Zapped ACE_RCSID
* ace/config-irix6.5.x-sgic++.h:
* ace/config-irix6.x-common.h:
* ace/config-irix6.x-g++.h:
* ace/config-irix6.x-sgic++.h:
* ace/config-sco-5.0.0-nothread.h:
* ace/config-sco-5.0.0.h:
* ace/config-unixware-7.1.0.h:
* ace/config-unixware-7.1.0.udk.h:
* include/makeinclude/platform_irix6.x_common.GNU:
* include/makeinclude/platform_irix6.x_g++.GNU:
* include/makeinclude/platform_irix6.x_sgic++.GNU:
* include/makeinclude/platform_tru64_cxx.GNU:
* include/makeinclude/platform_tru64_g++.GNU:
* include/makeinclude/platform_tru64_post.GNU:
* include/makeinclude/platform_tru64_pre.GNU:
* include/makeinclude/platform_unixware_g++.GNU:
Removed the files because Tru64, Irix, Unixware, and SCO support are
removed now
Diffstat (limited to 'ACE/include')
-rw-r--r-- | ACE/include/makeinclude/platform_irix6.x_common.GNU | 15 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_irix6.x_g++.GNU | 30 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_irix6.x_sgic++.GNU | 101 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_tru64_cxx.GNU | 128 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_tru64_g++.GNU | 45 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_tru64_post.GNU | 32 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_tru64_pre.GNU | 11 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_unixware_g++.GNU | 41 |
8 files changed, 0 insertions, 403 deletions
diff --git a/ACE/include/makeinclude/platform_irix6.x_common.GNU b/ACE/include/makeinclude/platform_irix6.x_common.GNU deleted file mode 100644 index a43bfc0818b..00000000000 --- a/ACE/include/makeinclude/platform_irix6.x_common.GNU +++ /dev/null @@ -1,15 +0,0 @@ -# $Id$ - -xt_reactor ?= 1 -debug ?= 1 -optimize ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXm -lXt -lX11 -PLATFORM_XT_LDFLAGS= - -ifndef ACE_IRIX_VERS -ACE_IRIX_VERS := $(subst .,,$(shell uname -r)) -endif # ACE_IRIX_VERS - -CPPFLAGS += -DACE_IRIX_VERS=$(ACE_IRIX_VERS) diff --git a/ACE/include/makeinclude/platform_irix6.x_g++.GNU b/ACE/include/makeinclude/platform_irix6.x_g++.GNU deleted file mode 100644 index f2ff118a9ff..00000000000 --- a/ACE/include/makeinclude/platform_irix6.x_g++.GNU +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ - -# Irix 6.X with GNU C++ - -include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU - -CC = gcc -CXX = g++ -CFLAGS += $(DCFLAGS) - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -L$(ACE_ROOT)/lib -Wl,-dont_warn_unused -LIBS += -lpthread -OCFLAGS += -O2 -PIC = -fpic -# AR = ar -ARFLAGS = rv -RANLIB = @true -SOFLAGS += -shared $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ - $(SOLINK.cc) $(LDFLAGS) -o $@ $(VSHDIR)$*.o - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU b/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU deleted file mode 100644 index 2f4f9495942..00000000000 --- a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU +++ /dev/null @@ -1,101 +0,0 @@ -# -*- Makefile -*- - -# $Id$ - -# Irix 6.[234] with SGI C++ -# In order to get the -n32 flag enabled please set the SGI_ABI -# environment variable to -n32. This causes a new compiler to be -# invoked. - -threads ?= 1 -templates ?= implicit - -include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU - -# Instead of setting the ABI here we rely on the the macro SGI_ABI. -CC = cc -CXX = CC -DLD = $(CXX) -LD = $(CXX) - -# Basic flags - -# In Irix 6.2 w/o the thread patches this macro should have no effect. -ifeq ($(threads),1) - CPPFLAGS += -D_SGI_MP_SOURCE -endif - -OCCFLAGS += -O -OPT:Olimit=0 -DCCFLAGS += -g - -# Enable 64-bit builds -ifeq (64,$(buildbits)) - CFLAGS += -64 - CPPFLAGS += -64 -endif - -# Enable exceptions even in the o32 bit ABI. -CCFLAGS += -exceptions -DACE_HAS_EXCEPTIONS - -# Use the standard library and standard template instantiation mechanisms -CCFLAGS += -LANG:std - -ifneq ($(templates),implicit) - # Instantiate no templates automatically, do not run prelinker. There - # are other choices available, but those have not been used in a while. - CCFLAGS += -no_prelink -endif # templates != implicit - -# Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might -# not build due to missing template instantiations. NOTE: it seems -# this setting no longer works for ACE. -#CCFLAGS += -ptall -# Instantiate used templates, plus prelinking instantiation -#CCFLAGS += -ptused -prelink -# Instantiate used templates, but do not run prelinker -#CCFLAGS += -ptused - -# Suppress warnings about "pack" pragmas not being defined -# Suppress warnings about "member with the same name as its class" -# Suppress warnings about "class has no copy assignment operator" -# Suppress warnings about "Access control" on inherited classes -# Suppress warnings about "last argument" of varargs function is unnamed -ifeq (7.3,$(findstring 7.3,$(CXX_VERSION))) - # 7.3.x doesn't have the 3506 error code - CCFLAGS += -diag_suppress 3284,1253,3439,1234 -else - CCFLAGS += -diag_suppress 3284,1253,3439,1234,3506 -endif - -LDFLAGS += -Wl,-woff,15 -LDFLAGS += -Wl,-woff,84 -LDFLAGS += -Wl,-woff,85 -LDFLAGS += -Wl,-woff,133 - -# You need to remove this if you are using 6.2 without the Pthread -# patches or if you want to compile without threads support. -ifndef DONT_LINK_PTHREADS -ifeq ($(threads),1) - LIBS += -lpthread -endif -endif - -PIC = -KPIC - -ifneq ($(templates),implicit) - AR = ar - ARFLAGS = r -else -# We need to create the archive via CC so that the prelinker can -# instantiate the required templates. - AR = CC -ar - ARFLAGS = -o -endif # templates != implicit - -RANLIB = echo -SOFLAGS += -shared $(CCFLAGS) $(CPPFLAGS) -all -multigot -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - /bin/ln $(VSHDIR)$*.o $@ - -# The math library -MATHLIB=-lm diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU deleted file mode 100644 index fd6f264cd1c..00000000000 --- a/ACE/include/makeinclude/platform_tru64_cxx.GNU +++ /dev/null @@ -1,128 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX using the cxx compiler. - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU - -# Note that TAO has not been tested with debug=0 on this platform. So -# you should be careful when turning off debug. -debug ?= 1 - -threads ?= 1 - -# Use of Standard C++ Library requires some flags to be added to the -# compile line -# -stdcpplib ?= 1 - -CC = cxx -CXX = $(CC) - -# Note: Just get the version if it hasnt been defined so far. -# -ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) -V) -endif # ! CXX_VERSION - -#### Note: -thread uses POSIX threads. If you want to use DCE threads -#### instead, change "-pthread" to "-threads". -ifeq ($(threads),1) - CFLAGS += -pthread -endif - -#### These flags can only be used with cxx Version 6.0 and later. -#### They are enabled by default; they can be disabled by settting -#### CXX_VER to CXX_5 either on the make command line, or by -#### or by setting the CXX_VER environment variable to CXX_5. -ifneq ($(CXX_VER),CXX_5) - WARNING_FLAGS += -w0 - ifneq (,$(VERBOSE_WARNING)) - WARNING_FLAGS += -msg_display_number -msg_display_tag - endif # VERBOSE_WARNING - - ifneq (,$(optimize)) - #### See ace/config-cxx-common.h for the meaning of this warning. - #### It's not necessary on DU 5.0. - WARNING_FLAGS += -msg_disable 1016 - endif # optimize - ifeq (4.,$(findstring 4.,$(shell uname -r))) - # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! - WARNING_FLAGS += -msg_disable 9 - endif -endif # 6.0 or later - -templates ?= automatic - -# Turn on the appropriate flags -# -ifeq ($(templates), automatic) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tall - endif -else - ifeq ($(templates), used) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tused - endif - endif # templates == used -endif # templates == automatic - -# Add the extra definitions needed to use the Standard Template Library -# -ifeq ($(stdcpplib), 1) - CPPFLAGS += -D__USE_STD_IOSTREAM -endif - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -soname $(SONAME) -endif - -CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG) -DCFLAGS += -g1 -O0 -DLD = $(CXX) -LD = $(CXX) -#### The -hidden [...] -non_hidden business avoids multiply defined -#### symbols between the shared library and libcxxstd.a. It's the -#### workaround recommended in PTR 43-4-204. It must appear before any -#### linker commands. -LDFLAGS += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden -LIBS += $(CFLAGS) -lxti -lrt -MATHLIB = -lm -OCFLAGS += -O3 -PIC = -ARFLAGS = cruvZ -# This is needed to pull in all the template instantiations from the -# repository into the library. -# -TMPINCDIR = cxx_repository - -# When libraries are archived, a hash index is automatically created -# so there is no need for ranlib -# -RANLIB = @true -SOFLAGS += -shared -use_ld_input $(ACELIB) - -LIBS := $(LIBS) -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - ln $(VSHDIR)$*.o $@ - -### There is a bug with pthreads header file shipped with v1885 of -### V5.1. We need to turn this flag to get asm () inline for -### compilation. -ifeq (1885,$(findstring 1885,$(ACE_DU_SUBVERSION))) - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - CPPFLAGS += -D_PTHREAD_ENV_DECCXX - endif # 6.x -endif #v1885 - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/ACE/include/makeinclude/platform_tru64_g++.GNU b/ACE/include/makeinclude/platform_tru64_g++.GNU deleted file mode 100644 index 06ff43506d7..00000000000 --- a/ACE/include/makeinclude/platform_tru64_g++.GNU +++ /dev/null @@ -1,45 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX using the GNU compiler. - -# Of late, this platform and compiler combination hasn't been tested. In -# fact neither compilation nor testing has been done for almost a year. -# So it's better to avoid this combination, if possible. - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU - -debug ?= 1 -threads ?= 1 -optimize ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -D_REENTRANT - -DCFLAGS += -g -LD = $(CXX) -DLD = $(CXX) -LIBS += -lpthread -lmach -lexc -lxti -lrt -OCFLAGS += -O3 -PIC = -fpic -ARFLAGS = cruvZ -# When libraries are archived, a hash index is automatically created so there -# is no need for ranlib -RANLIB = /usr/bin/true -SOFLAGS += -shared $(CPPFLAGS) $(ACELIB) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/ACE/include/makeinclude/platform_tru64_post.GNU b/ACE/include/makeinclude/platform_tru64_post.GNU deleted file mode 100644 index 52ccdc93d1a..00000000000 --- a/ACE/include/makeinclude/platform_tru64_post.GNU +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ - -# Common definitions which were in multiple files adding to the confusion - -# All versions of 4.x...Why doesn't Digital have 4.[a-z] ? That would be -# more fun... - -ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40D - else - ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40E - else - ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F - else - ifeq (4.0G,$(findstring 4.0G,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F # can't have 0x40G - else - CFLAGS += -DDIGITAL_UNIX=0x400 - endif - endif - endif - endif -else # ! 4.x - ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x510 - else - CFLAGS += -DDIGITAL_UNIX=0x500 - endif -endif # ! 5.x diff --git a/ACE/include/makeinclude/platform_tru64_pre.GNU b/ACE/include/makeinclude/platform_tru64_pre.GNU deleted file mode 100644 index 318ba855258..00000000000 --- a/ACE/include/makeinclude/platform_tru64_pre.GNU +++ /dev/null @@ -1,11 +0,0 @@ -# $Id$ - -# Common definitions for all versions of Digital Unix. - -ifndef ACE_DU_VERSION - ACE_DU_VERSION := $(shell uname -r) -endif # ! ACE_DU_VERSION - -ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) -endif # ! ACE_DU_SUBVERSION diff --git a/ACE/include/makeinclude/platform_unixware_g++.GNU b/ACE/include/makeinclude/platform_unixware_g++.GNU deleted file mode 100644 index 4871fd8ac47..00000000000 --- a/ACE/include/makeinclude/platform_unixware_g++.GNU +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ - -# UnixWare V2.2.1.2 with g++ version 2.7.2.2 - -debug ?= 0 -threads ?= 1 - -CC = gcc -CXX = g++ - -ACE_GNUG_ON_UNIXWARE = 1 - -CCFLAGS += -fexceptions - -DCFLAGS += -g -#DCFLAGS += -g - -OCCFLAGS += -O2 - -DLD = $(CXX) -g -LD = $(CXX) -LIBS += -lsocket -lnsl -lgen -lthread -PIC = -fpic -AR = ar -ARFLAGS = ruv -RANLIB = /bin/true -#SOFLAGS = -assert pure-text -SOFLAGS += -shared -# SOBUILD - compile into .so directly -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $< -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -pipes ?= 1 -CFLAGS += -W -Wall -Wpointer-arith #### -Winline -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) |