summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/include/makeinclude')
-rw-r--r--ACE/include/makeinclude/platform_aix.GNU103
-rw-r--r--ACE/include/makeinclude/platform_aix_g++.GNU92
-rw-r--r--ACE/include/makeinclude/platform_aix_ibm.GNU194
-rw-r--r--ACE/include/makeinclude/platform_gcc_clang_common.GNU10
-rw-r--r--ACE/include/makeinclude/platform_hpux_aCC.GNU213
-rw-r--r--ACE/include/makeinclude/platform_hpux_gcc.GNU105
-rw-r--r--ACE/include/makeinclude/platform_linux_suncc.GNU74
-rw-r--r--ACE/include/makeinclude/platform_openvms.GNU101
-rw-r--r--ACE/include/makeinclude/platform_rtems.x_g++.GNU49
-rw-r--r--ACE/include/makeinclude/platform_sunos5_common.GNU45
-rw-r--r--ACE/include/makeinclude/platform_sunos5_g++.GNU65
-rw-r--r--ACE/include/makeinclude/platform_sunos5_sunc++.GNU264
-rw-r--r--ACE/include/makeinclude/platform_vxworks6.6.GNU4
-rw-r--r--ACE/include/makeinclude/rules.bin.GNU8
-rw-r--r--ACE/include/makeinclude/rules.lib.GNU63
-rw-r--r--ACE/include/makeinclude/rules.local.GNU17
-rw-r--r--ACE/include/makeinclude/wrapper_macros.GNU6
17 files changed, 10 insertions, 1403 deletions
diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU
deleted file mode 100644
index 7d09c969385..00000000000
--- a/ACE/include/makeinclude/platform_aix.GNU
+++ /dev/null
@@ -1,103 +0,0 @@
-
-# AIX 5.x using the IBM C Set++ compiler.
-#
-# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3,
-# and Riverace is not testing or supporting ACE on them either. No steps
-# have been taken to intentionally disable anything, but it is not being
-# tested either.
-#
-# NOTE 2! This file is only for use with the older CSet++ compiler, which
-# IBM doesn't sell or support any longer. Riverace doesn't support ACE
-# with it either. This file is still here in case there is some site
-# still using the old compiler, but it is completely unsupported.
-#
-# On 4.1, this file assumes that the user has installed the AIX patch
-# containing the dl*() APIs. To use these APIs, IBM has created a
-# separate product (free to AIX licensees) called shared library
-# hookable symbols (or slhs/6000). If they don't have this patch, the
-# sv* commands for compiling and linking will not be present on the
-# system.
-#
-# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or
-# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*()
-# routines to work properly. Best to apply the update available at:
-# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
-# or a successor.
-
-debug ?= 1
-distrib ?= 0
-optimize ?= 0
-threads ?= 1
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-# aix_build turns on the funky shared library building code.
-aix_build = 1
-# ibmcxx_build turns on the extra step for instantiating and compiling
-# template instances.
-ibmcxx_build = 1
-
-ifeq ($(threads),1)
-CC = xlc_r
-CXX = xlC_r
-DLD = makeC++SharedLib_r
-else
-CC = xlc
-CXX = xlC
-DLD = makeC++SharedLib
-endif
-
-# -qextchk is handy, but produces false type mismatches when linking
-# netsvcs with 3.1.4, so it's disabled. IBM reports this fixed in 3.6.4.
-TEMPINCDIR = tempinc
-CCFLAGS += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -qinfo
-
-# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued
-# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask
-# lslpp for one or the other. Instead, compile a file and see which compiler
-# the user has set up for use. This trick was submitted by Craig Rodrigues
-# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1)
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-ifeq ($(XLCVERSION),0x0306)
- CCFLAGS += -qflag=e:e
-else
- CCFLAGS += -qflag=w:w
-endif
-CPPFLAGS += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-
-# -qinitauto seems useful, but when built with -qinitauto=5F, the
-# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
-DCFLAGS += -g -qcheck=nobounds:div:null
-
-ACELIB = -lACE
-LD = $(CXX)
-
-ifeq ($(AIX_MINOR_VERS),1)
-LLIBS = -lsvld -ltli_r $(ACELIB)
-LIBS += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
-else
-LIBS += -ltli_r -ldl
-endif
-
-ARFLAGS = ruv
-AR = ar
-LDFLAGS += -bI:/lib/pse.exp
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default. To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS += -qarch=ppc -qtune=604
-OCCFLAGS += -O2 -qarch=com
-RANLIB = ranlib
-SOFLAGS = -p 0
-
-SOVERSION =
-SONAME =
diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU
deleted file mode 100644
index 0ec6775e370..00000000000
--- a/ACE/include/makeinclude/platform_aix_g++.GNU
+++ /dev/null
@@ -1,92 +0,0 @@
-# Platform macros for building on AIX with g++. This has been tested on
-# AIX 4.3 and 5 with gcc 3. Earlier versions of gcc may compile, but are
-# known to have serious problems on AIX.
-#
-# Contributed by Ian Wright <I.Wright@elsevier.co.uk>
-# Updated for AIX 4.3 and gcc 3 by Steve Huston <shuston@riverace.com>
-
-debug ?= 1
-distrib ?= 0
-optimize ?= 1
-threads ?= 1
-buildbits ?= 32
-with_ld ?= aix
-no_hidden_visibility ?= 1
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=
-
-# Yes, believe it or not...
-# The way to make a shared lib on AIX is to make a shared object file and
-# then put that in an archive.
-# Non-shared archives are named lib<x>ns.a - ns = non-shared.
-SOEXT = so
-LDFLAGS += -Wl,-brtl
-
-ifeq (1,$(threads))
- FLAGS_C_CC += -pthread
-endif
-
-ifeq ($(shared_libs),1)
-ACELIB = -lACE
-else
-ACELIB = -lACEns
-endif
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS)
-
-CC = gcc
-CXX = g++
-
-FLAGS_C_CC += -DACE_AIX_VERS=$(AIX_VERS)
-ifeq ($(buildbits),32)
- FLAGS_C_CC += -maix32
-endif
-ifeq ($(buildbits),64)
- FLAGS_C_CC += -maix64
- LDFLAGS += -maix64
- ARFLAGS += -X64
-endif
-DCFLAGS += -g
-DCCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld.
-# Don't do it for everything because it decreases run-time performance.
-ifeq ($(notdir $(shell pwd)), TAO_IDL)
-LDFLAGS += -Wl,-bbigtoc
-endif
-
-OCFLAGS = -O2
-OCCFLAGS = $(OCFLAGS)
-ifeq ($(threads),1)
- SOFLAGS += -pthread
-endif
-
-# AIX 5 has a new ld option, -bexpfull, that exports all the symbols that
-# g++ 3.3+ needs to work correctly. The new option is available by default
-# in AIX 5.2 and later, but must be installed by a patch to AIX 5.1.
-ifeq ($(AIX_MAJOR_VERS),5)
- SOFLAGS += -shared -Wl,-bexpfull # -Wl,-bloadmap:lib.mapelse
-else
- SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map
-endif
-
-LIBS += -lxti -ldl
-ARFLAGS += cruv
-RANLIB = ranlib
-LD_RPATH = -Wl,-R,
-
-# Test for template instantiation, add to SOFLAGS if versioned_so set,
-# add -E to LDFLAGS if using GNU ld
-#
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU
deleted file mode 100644
index aa9f3f76775..00000000000
--- a/ACE/include/makeinclude/platform_aix_ibm.GNU
+++ /dev/null
@@ -1,194 +0,0 @@
-
-# This file is for use with AIX 5.x and up, using either of the IBM
-# compilers (Visual Age C++ 6 or newer XL C++ compiler).
-
-debug ?= 1
-distrib ?= 0
-optimize ?= 0
-threads ?= 1
-buildbits ?= 32
-
-ifeq (,$(inline))
-ifeq (1,$(debug))
- inline = 0
-else
- inline = 1
-endif
-endif
-
-# First, find out which compiler we're building with. The settings we
-# use for compiling, as well as how to build shared libraries, depend on
-# the compiler version. There's no easy way to ask lslpp which is installed.
-# Instead, compile a file and see which compiler is set up for use. This
-# trick was submitted by Craig Rodrigues <rodrigc@mediaone.net>, originally
-# from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -n 1;$(RM) testxlCvers.cpp)
-#XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1')
-#ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS)
-
-SOEXT = so
-SOFLAGS += -G
-LDFLAGS += -brtl
-#SHR_FILTER=$(ACE_ROOT)/bin/aix_shr
-
-ifeq ($(threads),1)
-# Note - the _r form of the compiler command turns on -qthreads and the
-# thread-required preprocessor defines, as well as -lpthreads for linking.
-# If this is Visual Age C++ 5, DLD will get reset below.
-CC = xlc_r
-CXX = xlC_r
-DLD = makeC++SharedLib_r
-else
-CC = xlc
-CXX = xlC
-DLD = makeC++SharedLib
-endif
-
-ARFLAGS = ruv
-AR = ar
-LD = $(SHR_FILTER) $(CXX)
-RANLIB = ranlib
-
-CPPFLAGS += -DACE_AIX_VERS=$(AIX_VERS)
-
-# AIX 5.2 offers POSIX aio, but the Visual Age C++ compiler can't grok the
-# aio.h header file. This is a known problem and will be addressed in
-# May 2004 (per IBM). This is a workaround for it, supplied by IBM.
-# When the compiler fix is released, this workaround (and the change
-# to -qflag, below) can be removed. (Steve Huston)
-ifeq (502,$(AIX_VERS))
-CPPFLAGS += -U__C99_RESTRICT
-endif
-
-# -qinitauto seems like an interesting option, but some tests (specifically
-# Process_Strategy_Test) hang with it turned on. This should be investigated
-# at some point.
-DCCFLAGS += -g -qcheck=nobounds:div:null
-DCFLAGS += -g
-
-ifeq ($(XLCVERSION),0x0600)
- # This is just for the workaround for aio, above. Without it, the
- # compiler warns that __C99_RESTRICT is reserved. When that workaround
- # is gone, this ifeq can be removed also. -qflag=w:w is what we want
- # in the end.
- CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
- ifeq (502,$(AIX_VERS))
- CCFLAGS += -qflag=e:e
- else
- CCFLAGS += -qflag=w:w
- endif
-else
- ifeq ($(XLCVERSION),0x0700)
- CCFLAGS += -qflag=w:w
- ifeq ($(templates),manual)
- CCFLAGS += -qnotempinc -qnotemplateregistry
- else
- CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
- endif
- # According to documentation, default is -qeh, which is equivalent
- # to -qeh=v5. Apparently 6.0 fixed some problems with nested
- # try-catch blocks.
- CCFLAGS += -qeh=v6
- else
- ifeq ($(XLCVERSION),0x0800)
- CCFLAGS += -qflag=w:w
- ifeq ($(templates),manual)
- CCFLAGS += -qnotempinc -qnotemplateregistry
- else
- CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
- endif
- # According to documentation, default is -qeh, which is equivalent
- # to -qeh=v5. Apparently 6.0 fixed some problems with nested
- # try-catch blocks.
- CCFLAGS += -qeh=v6
- else
- # Until there's a reason to change, use the V9 settings for V10.1, 11.1,
- # 12.1 and 13.1.
- ifeq ($(XLCVERSION),0x0a01)
- XLCVERSION = 0x0900
- endif
- ifeq ($(XLCVERSION),0x0b01)
- XLCVERSION = 0x0900
- endif
- ifeq ($(XLCVERSION),0x0c01)
- XLCVERSION = 0x0900
- endif
- ifeq ($(XLCVERSION),0x0d01)
- XLCVERSION = 0x0900
- endif
- ifeq ($(XLCVERSION),0x0900)
- CCFLAGS += -qflag=w:w
- ifeq ($(templates),manual)
- CCFLAGS += -qnotempinc -qnotemplateregistry
- else
- CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE)
- endif
- # According to documentation, default is -qeh, which is equivalent
- # to -qeh=v5. Apparently 6.0 fixed some problems with nested
- # try-catch blocks.
- CCFLAGS += -qeh=v6
- else
- CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
- endif
- endif
- endif
-endif
-
-DLD = $(CXX) -qmkshrobj
-SOFLAGS += $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
-
-ifeq ($(buildbits),64)
- DLD += -q64
- CFLAGS += -q64 -qwarn64
- CCFLAGS += -q64 -qwarn64
- ARFLAGS := -X64 $(ARFLAGS)
-
- # This option results in a crash of TAO when building 64bit with
- # Visual Age 6. No idea why but don't use it when using Visual Age 6.
- ifneq ($(XLCVERSION),0x0600)
- # CCFLAGS += -qstaticinline
- endif
-else
- # Using 32bit the staticinline option works.
- #CCFLAGS += -qstaticinline
-endif
-
-# The Visual Age preprocessor is not usable with the TAO_IDL compiler.
-# At the moment an idl file just contains includes of other idl files
-# the Visual Age preprocessor doesn't report that file in the list of
-# files that is used. The only way we can workaround this is using the
-# gcc preprocessor, do this in your platform_macros.GNU is this
-# causes problems
-# TAO_IDL_PREPROCESSOR = gcc
-
-ifeq ($(exceptions),0)
- CCFLAGS += -qnoeh
-endif
-
-CCFLAGS += -qrtti=all
-
-ifeq ($(shared_libs),1)
-ACELIB = -lACE
-else
-ACELIB = -lACEns
-endif
-
-LIBS += -lxti -ldl
-
-SONAME =
-SOVERSION =
-# Default OCCFLAGS builds turns on mid-level optimize level. Compiler defaults
-# to build machine's architecture and a reasonable tuning effort for recent
-# machine architectures. To optimize for a more specific architecture, set
-# your OCCFLAGS to the desired -qarch and/or -qtune values. For example:
-#OCCFLAGS += -qarch=ppc -qtune=604
-
-OCCFLAGS += -qlibansi -O2
diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
index ac70c620b61..bd147cc8746 100644
--- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
@@ -80,15 +80,7 @@ templates ?= automatic
versioned_so ?= 1
with_ld ?=
ifneq ($(versioned_so),0)
- ifeq ($(with_ld),hpux)
- SOFLAGS += -Wl,+h -Wl,$(SONAME)
- else
- ifeq ($(with_ld),aix)
- # What to do here???
- else
- SOFLAGS += -Wl,-h -Wl,$(SONAME)
- endif
- endif
+ SOFLAGS += -Wl,-h -Wl,$(SONAME)
endif
ifeq ($(versioned_so),2)
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
deleted file mode 100644
index 5a6dbea96ff..00000000000
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ /dev/null
@@ -1,213 +0,0 @@
-#
-# This is for HP-UX 11.x using the aC++ compiler.
-#
-# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which
-# architecture the build is done on. This file is set up to build native
-# to the machine it's running on. To cross-build for another platform, add
-# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit
-# build. Note that if you explicitly specify a 64-bit build, the option
-# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
-# file detected..." messages.
-
-buildbits ?= 0
-debug ?= 1
-distrib ?= 0
-optimize ?= 0
-stdcpplib ?= 1
-threads ?= 1
-versioned_so ?= 0
-
-# First, extract the OS version number.
-HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPMODEL := $(shell uname -m)
-HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
-#
-CC = /bin/cc
-CXX = aCC
-
-# Determine compiler version
-CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1))
-CXXINFO := $(word 3, $(CXXVERS_WORDS))
-# aCC++ 3.67 gives "aCC: HP ANSI C++ B3910B A.03.67"
-# aCC++ 3.73 gives "aCC: HP ANSI C++ B3910B A.03.73"
-#
-ifeq (ANSI, $(CXXINFO))
- CXXMINORVERS := $(word 8, $(CXXVERS_WORDS))
- CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS))
-else
- ifeq (aC++/ANSI, $(CXXINFO))
- CXXMINORVERS := $(word 8, $(CXXVERS_WORDS))
- CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS))
- else
- CXXMINORVERS := $(word 7, $(CXXVERS_WORDS))
- CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS))
- endif
-endif
-
-# Want to be able to do [unsigned] long long.
-CCFLAGS += -ext
-
-ifeq (1,$(stdcpplib))
- CCFLAGS += -AA
- ifeq (03,$(CXXMAJORVERS))
- # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP
- # as support call 3201224717. (Steve Huston, 23-Nov-2002)
- CCFLAGS += +W930
- endif
-# Compile errors using -AA and +noeh together - HP problem report
-# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001.
-else
- CCFLAGS += -AP
-endif
-
-# Set the appropriate preprocessor defs for threading based on OS version
-# and specified compiler options.
-ifeq ($(threads),1)
- THR_DEFS = -DACE_HAS_THREADS
- CC_THR_DEFS += -mt
-else
- THR_DEFS = -DACE_HAS_THREADS=0
- # On HP-UX 11, even without building for threads, the *_r reentrant
- # functions are available, and _REENTRANT enables them.
- THR_DEFS += -D_REENTRANT
-endif
-
-ifeq ($(HPMODEL), ia64)
- itanium = 1
-endif
-
-ifeq (03,$(CXXMAJORVERS))
- # Suppress Warning 302 ((...) parameter list is a non-portable feature)
- # Suppress Warning 361 (missing return from non-void function)
- # Suppress Warning 1039(Binary incompatabilty between old and new compilers)
- CCFLAGS += +W302,361,1039
- ifeq (57,$(CXXMINORVERS))
- # aCC 3.57 has a bug. When a class has private constructors
- # and is trying to be created from a friend class we end up with
- # a compile error. We disable array optimization in the compiler
- # by setting this environment variable. HP CR JAGaf43094
- export aCC_ARRAY_OPT=OFF
- endif
- ifeq (60,$(CXXMINORVERS))
- # Same bug as above
- export aCC_ARRAY_OPT=OFF
- endif
- ifeq (80,$(CXXMINORVERS))
- # Enabled template meta programming
- CCFLAGS += +hpxstd98
- endif
- ifeq (85,$(CXXMINORVERS))
- # Enabled template meta programming
- CCFLAGS += +hpxstd98
- endif
-endif
-
-ifeq (05,$(CXXMAJORVERS))
- # Warnings about binary incompatiblity
- CCFLAGS += +W1016,1031
-endif
-
-ifeq (06,$(CXXMAJORVERS))
- ifeq (13,$(CXXMINORVERS))
- # Warnings dllexport/dllimport conflict with "x" (declared at line y); dllexport assumed
- CCFLAGS += +W3390,3397
- endif
-endif
-
-CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE
-CCFLAGS += $(CC_THR_DEFS)
-
-DCCFLAGS += -g
-DLD = $(CXX) $(CCFLAGS)
-LD = $(CXX)
-OCCFLAGS = -O
-PIC = +Z
-
-AR = /usr/ccs/bin/ar
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -Wl,+s -z
-SOFLAGS += -b
-
-ifeq ($(distrib),1)
-
-ifeq ($(buildbits),32)
-SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib
-endif
-ifeq ($(buildbits),64)
- ifeq ($(itanium),1)
- SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/hpux64
- else
- SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64
- endif
-endif
-
-endif
-
-ifeq ($(itanium),1)
- SOEXT = so
-else
- SOEXT = sl
-endif
-
-ifeq ($(buildbits),32)
- ifeq ($(itanium),1)
- CFLAGS += +DD32
- CCFLAGS += +DD32
- else
- CFLAGS += +DA1.1 +DS1.1
- CCFLAGS += +DA1.1 +DS1.1
- endif
-else
-ifeq ($(buildbits),64)
- ifeq ($(itanium),1)
- CFLAGS += +DD64
- CCFLAGS += +DD64
- else
- ## Without the W, it isn't really a 64-bit build
- CFLAGS += +DA2.0W +DS2.0W
- CCFLAGS += +DA2.0W +DS2.0W
- endif
-LDFLAGS += -Wl,+vnocompatwarnings
-else
- ifneq ($(itanium),1)
- # HP aCC on Itanium doesn't support this option, defaults to 32bit then.
- CFLAGS += +DAportable
- CCFLAGS += +DAportable
- endif
-endif
-endif
-
-#11.x:
-ifeq ($(threads),1)
- # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it.
- ifeq ($(findstring -mt,$(CCFLAGS)),)
- ## -L./ must directly preceed the system libraries for 64-bit builds
- ## with aCC 3.27. Without this change, libpthread.sl can not be found.
- LIBS += -L./ -lpthread
- endif
-endif
-LIBS += -lxti -lrt -ldld
-
-# The correct flags to pass to the linker for dynamic shared library
-# versioning
-#
-ifneq ($(SONAME),)
- SOFLAGS += -Wl,+h -Wl,$(SONAME)
-endif
-
-# if _FILE_OFFSET_BITS==64 then the HP headers will produce
-# spurious 600 warnings, except on 11.23
-# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11
-#
-ifeq ($(64bitoffsets),1)
- ifneq ($(HPUX_VERS), 1123)
- CCFLAGS += +W600
- endif
-endif
-
-ifeq ($(c++11),1)
- CCFLAGS += -Ax
-endif
-
-LD_RPATH = -Wl,+s,+b,
diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU
deleted file mode 100644
index f6b754aa32a..00000000000
--- a/ACE/include/makeinclude/platform_hpux_gcc.GNU
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-
-buildbits ?= 64
-debug ?= 1
-distrib ?= 0
-optimize ?= 1
-stdcpplib ?= 1
-threads ?= 1
-versioned_so ?= 0
-with_ld ?= hpux
-
-# First, extract the OS version number.
-HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPMODEL := $(shell uname -m)
-HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
-#
-CC = gcc
-CXX = g++
-CFLAGS += -w
-
-#
-# Set the appropriate preprocessor defs for threading based on OS version.
-# If the user has requested building without threads, then don't set any.
-#
-ifeq ($(threads),1)
- ifeq (3.,$(findstring 3.,$(CXX_VERSION)))
- THR_DEFS = -threads
- endif
- ifeq ($(word 2,$(HPVERS_WORDS)), 11)
- THR_DEFS += -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
- else
- THR_DEFS += -DACE_HAS_THREADS -D_REENTRANT
- endif
-endif
-
-ifeq ($(HPMODEL), ia64)
- itanium = 1
-endif
-
-# On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and
-# sys/pthread.h - both define the function, but slightly differently.
-# -fstrict-prototype resolves the issue.
-#ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-#CCFLAGS += -fstrict-prototype
-#endif
-DCFLAGS += -g
-DCCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-OCFLAGS += -O2
-PIC = -fPIC
-# GNU ar doesn't work (missing libfl.sl?) so use HP ar.
-AR = /usr/bin/ar
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s
-SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $<
-PRELIB = @true
-
-ifeq ($(itanium),1)
- SOEXT = so
-else
- SOEXT = sl
-endif
-
-ifeq ($(itanium),1)
- ifeq ($(buildbits),64)
- CCFLAGS += -mlp64
- CFLAGS += -mlp64
- else
- CCFLAGS += -milp32
- CFLAGS += -milp32
- endif
-endif
-
-#
-# Grab the appropriate libraries based on the version of HP-UX we're building
-# on and whether or not thread support is being used.
-#
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-
- #11.x:
- ifeq ($(threads),1)
- LIBS += -lxti -lpthread -lrt -ldld
- else
- LIBS += -lxti -lrt -ldld
- endif
-
-else
-
- # 10.x:
- LIBS += -lxti -ldld
- ifeq ($(threads),1)
- LIBS += -lcma
- endif
-
-endif
-
-# Test for template instantiation, add to SOFLAGS if versioned_so set,
-# add -E to LDFLAGS if using GNU ld
-#
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-
-CCFLAGS += -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS)
diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU
deleted file mode 100644
index 3489fc423e9..00000000000
--- a/ACE/include/makeinclude/platform_linux_suncc.GNU
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# This file should allow ACE to be built on Linux, using the Sun compiler.
-# The Sun compiler on linux is still in the Alpha stage, so no guarantees
-# given at this point
-
-include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU
-
-no_hidden_visibility ?= 1
-
-ifeq ($(insure),0)
- CC = CC
- CXX = CC
-endif
-
-GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION)
-ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION)))
- CPPFLAGS += -DACE_HAS_LINUX_NPTL
-endif
-
-DCCFLAGS += -g
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -ldl
-OCCFLAGS = -O3
-OCFLAGS = -O3
-PRELIB = @true
-SOFLAGS += -shared
-PIC = -PIC
-
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
-ifeq ($(threads),1)
- CPPFLAGS += -D_REENTRANT
- LIBS += -lpthread -lrt
-endif
-
-ifeq ($(optimize),0)
- # Disable all optimizing in code
- CPPFLAGS += -O0
-endif
-
-
-ifeq ($(shared_libs), 1)
- ifneq ($static_libs_only), 1)
- ifneq ($(no_hidden_visibility),1)
- CCFLAGS += -fvisibility=hidden
- else
- CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
- endif # no_hidden_visibility
- endif
-endif
-
-ifeq ($(buildbits),32)
- CFLAGS += -m32
- LDFLAGS += -m32
-endif
-ifeq ($(buildbits),64)
- CFLAGS += -m64
-endif
-
-# Enable GNU extensions
-CPPFLAGS+= -D_GNU_SOURCE
-
-# Added line below to support "Executable Shared Object" files (as
-# needed by the service configurator).
-# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ifeq ($(threads),1)
- ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
- ifndef PRELIB
- PRELIB = @true
- endif # ! PRELIB
-endif
diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU
deleted file mode 100644
index ee2cb678ba7..00000000000
--- a/ACE/include/makeinclude/platform_openvms.GNU
+++ /dev/null
@@ -1,101 +0,0 @@
-
-# for OpenVMS GNV
-
-ACE_OPENVMS = 1
-versioned_so ?= 0
-debug ?= 1
-optimize ?= 0
-threads ?= 1
-pthread ?= 1
-ssl ?= 0
-rwho ?= 0
-buildbits ?= 32
-
-VDIR ?= obj/
-VSHDIR ?= shobj/
-PRELINK_TYPE ?= USE_OLB
-
-LN_S = cp -p
-DEFFLAGS +=
-CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short
-ifeq ($(HOSTTYPE),ia64)
- CCFLAGS += "-Wc/warn=DISABLE=(INTOVERFLOW,REFTEMPORARY,INTSIGNCHANGE)"
-else
- CCFLAGS += -msg_disable intoverflow,reftemporary,intsignchange
-endif
-CCFLAGS += -Wc/template=auto
-
-ifeq ($(buildbits),64)
- CCFLAGS += -Wc/MODEL=ANSI
-endif
-
-ifeq ($(HOSTTYPE),ia64)
- ACE_OPENVMS_IA64 = 1
- SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt
- ifeq ($(PRJ_TYPE),library)
- ifeq ($(shared_libs),1)
- CCFLAGS += "-Wc/export_sym=(OPTIONS_FILE=$(SYMVEC_OPT_FILE),ALL,NOTEMPLATES)"
- endif
- endif
-else
- LDFLAGS += -Wl/PRELINK=$(PRELINK_TYPE)/MAP/CROSS
-endif
-
-ifeq ($(debug),1)
- LDFLAGS += -g
-endif
-LDFLAGS += -threads
-DCCFLAGS += -g
-OCCFLAGS += -O
-
-CFLAGS += -ieee -names_as_is_short
-DCFLAGS += -g
-OCFLAGS += -O
-
-PIC =
-RANLIB = @true
-ifeq ($(HOSTTYPE),ia64)
- ARFLAGS = -r
- SOFLAGS = -shared $(SYMVEC_OPT_FILE)
-else
- ARFLAGS = -c
- SOFLAGS = -shared -auto_symvec
-endif
-ifeq ($(pthread),1)
- LIBS += -lpthread
-endif
-
-CC = cc
-CXX = cxx
-LD = $(CXX)
-DLD = $(CXX)
-SOVERSION =
-SOEXT = exe
-EXEEXT = .exe
-
-ifeq ($(HOSTTYPE),ia64)
- REALCLEAN_FILES += $(SYMVEC_OPT_FILE) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
- $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN))
-else
- REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \
- $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN))
-endif
-
-ifneq ($(MAKEFILE),$(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE))
-VMS_DUMMY_ := $(VMS_DUMMY_)
-endif
-
-ifeq ($(HOSTTYPE),ia64)
- ifeq ($(shared_libs),1)
- ifneq ($(SHLIB),)
-BUILD := post_build.local
-
-.PHONY: post_build.local
-
-post_build.local:
- @-if [ ! -z "$(VSHLIB)" ]; then dcl "set image/success $(VSHLIB)"; echo ""; fi
-
- endif
- endif
-endif
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 =
diff --git a/ACE/include/makeinclude/platform_sunos5_common.GNU b/ACE/include/makeinclude/platform_sunos5_common.GNU
deleted file mode 100644
index 0dc819189f1..00000000000
--- a/ACE/include/makeinclude/platform_sunos5_common.GNU
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Makefile -*-
-
-
-# SunOS 5.x common settings
-
-ifeq ($(shell /bin/uname -r),5.9)
- # Solaris 9 puts sendfile() in a separate library.
- LIBS += -lsendfile
-endif
-ifeq ($(shell /bin/uname -r),5.10)
- # Solaris 10 puts sendfile() in a separate library.
- LIBS += -lsendfile
- sctp ?= lksctp
-endif
-ifeq ($(shell /bin/uname -r),5.11)
- # Solaris 11 puts sendfile() in a separate library.
- LIBS += -lsendfile
- sctp ?= lksctp
-endif
-kstat ?= 1
-ifeq ($(kstat),1)
- # Unguard the raw monitor code and link the system lib.
- FLAGS_C_CC += -DACE_HAS_KSTAT
- LIBS += -lkstat
-endif
-
-PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include
-PLATFORM_X11_LIBS =-lX11
-PLATFORM_X11_LDFLAGS=
-
-PLATFORM_TK_CPPFLAGS=
-PLATFORM_TK_LIBS=-ltk -ltcl
-PLATFORM_TK_LDFLAGS=
-
-# TODO: Fix the parameters
-#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4
-#PLATFORM_TCL_LIBS=-ltcl8.4
-#PLATFORM_TCL_LDFLAGS=
-
-sctp ?=
-ifeq ($(sctp),lksctp)
- PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_LKSCTP
- PLATFORM_SCTP_LIBS?= -lsctp
-endif
-
diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU
deleted file mode 100644
index f5f0b990bb6..00000000000
--- a/ACE/include/makeinclude/platform_sunos5_g++.GNU
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Makefile -*-
-
-# SunOS 5.x (Solaris 2.x) with g++
-
-# NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as,
-# if you want -gstabs+ and -pipe support.
-
-debug ?= 1
-optimize ?= 1
-threads ?= 1
-buildbits ?= 32
-
-ifeq ($(buildbits),64)
- FLAGS_C_CC += -m64
- LDFLAGS += -m64
-endif
-
-ifeq ($(shell /bin/uname -m),i86pc)
- #### gcc on Solaris86 doesn't use -g
- DCFLAGS += -gstabs+
- DCCFLAGS += -gstabs+
-else # ! i86pc
- DCFLAGS += -g
- DCCFLAGS += -g
-endif # ! i86pc
-
-CC = gcc
-CXX = g++
-
-ifeq ($(threads),1)
- CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-endif
-
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS +=
-LIBS += -lsocket -ldl -lgen -lnsl -lposix4 -lthread
-OCFLAGS += -O3
-OCCFLAGS += -O3
-PIC = -fPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = @true
-SOFLAGS += -shared $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
-LD_RPATH = -Wl,-R,
-
-# Get common Solaris settings
-include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU
-
-# 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
-
-# Make sure we resolve all symbols at link time, see bugzilla 2710
-LDFLAGS += -z now
-
-## Unfortunately, gcc 3.0 fails to many cpp files with
-## optimization enabled. Even -O causes the compiler
-## to core dump on some files.
-ifeq ($(shell $(CXX) --version),3.0)
- override optimize = 0
-endif
diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
deleted file mode 100644
index 34c6be57aeb..00000000000
--- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
+++ /dev/null
@@ -1,264 +0,0 @@
-# -*- Makefile -*-
-
-
-# SunOS 5.x (Solaris 2.x) with Sun C++ 4.2 and 5.x
-#
-# NOTE: Sun C++ 5.0 users might need to add this to their CCFLAGS:
-# -compat=4 and/or remove -instances=explicit. Please note that
-# inlining is disabled by default with Sun C++ 5.0. If you'd like
-# to try enabling it, comment out the "inline = 0" line below.
-#
-# To enable compilation of 64-bit binaries with Sun CC 5.0, a
-# platform_macros.GNU file such as this can be used:
-# fast=1
-# include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
-# CFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific!
-# SOFLAGS += -xtarget=ultra2 -xarch=v9a
-# LDFLAGS += -L/opt/SUNWspro/SC5.0/lib/v9 -L/usr/lib/sparcv9
-# Please note that the xtarget and xarch settings are specific to
-# the target CPU. The /opt/SUNWspro/ Sun C++ installation directory
-# is site-specific.
-#
-# To build 64-bit binaries with Forte 6 and later, build with the
-# "buildbits=64" option (make buildbits=64).
-#
-# With slight modification, this file could be used with Sun C++ 4.1.
-# However, it's likely that you won't be able to build all of ACE
-# with Sun C++ 4.1.
-#
-# NOTE: some ACE files might generate this warning:
-# "Warning: Could not find source for " one of the following:
-# default constructor, copy constructor, destructor, or assignment
-# operator. It appears that with +w, Sun C++ 4.x issues this warning
-# whenever it has to generate one of these functions (because it wasn't
-# defined by the user). This isn't really a problem.
-# This warning appears to be fixed by Sun C++ 4.2 jumbo patch 104631-02.
-#
-# -pta instantiates all template members, which makes libraries bigger.
-# But, it's supposed to put each member into it's own .o, so executable
-# size should not be penalized. We don't use it because it's not
-# necessary with automatic template instantiation.
-
-compat4 ?= 0
-debug ?= 1
-distrib ?= 1
-rwtools ?= 0
-stdcpplib ?= 1
-stlport ?= 0
-threads ?= 1
-pthreads ?= 1
-versioned_so ?= 1
-tk_reactor ?= 0
-ace_with_x11 ?= 0
-no_annotations ?= 1
-no_hidden_visibility ?= 1
-templates ?= automatic
-
-## If you set this to 1 you will need to add -xarch=v8plus (or higher)
-## to CFLAGS or the assembler code will not compile
-atomic_ops_sparc ?= 0
-
-ifeq ($(threads),1)
- CFLAGS += -mt
- LDFLAGS += -mt
-endif # threads
-
-CC = cc
-CXX = CC
-
-CC_VERSION := $(shell $(CXX) -V 2>&1)
-
-### CC 5.4 provides insufficient preprocessor output (at 111715-17 2005/10/13)
-### We need to use cc instead - see bugzilla #2478.
-ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION)))
- ACE_CC_PREPROCESSOR = cc
-endif
-
-ifeq ($(atomic_ops_sparc),1)
- CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC
-endif
-
-#### The following macro overrides enable creation of fast executables.
-#### They _don't_ support fast compilation :-)
-#### To use, add fast=1 to your "make" invocation.
-####
-#### -g is incompatible with -fast. If you need -g, you can
-#### use "-fast -O3".
-####
-#### Have to do this _before_ adding any -xarch, -xtarget, etc. flags since
-#### -fast is shorthand for a list of internally-assigned options, some of
-#### which will are -xarch, -xtarget. Thus, explicit -xarch needs to go
-#### to the right of -fast.
-DCFLAGS += -g
-DCCFLAGS +=
-DLD = $(CXX)
-ifeq (1,$(fast))
- CFLAGS += -fast
- DCFLAGS =
- DCCFLAGS =
- LDFLAGS += -fast
-endif # fast
-# Make sure we resolve all symbols at link time, see bugzilla 2710
-LDFLAGS += -z now
-
-# Studio 8 or better has version greater than 5.4 (Studio 8 == CC 5.5).
-STUDIO_8_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 54; then echo 1; else echo 0; fi)
-STUDIO_12_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 58; then echo 1; else echo 0; fi)
-
-ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION)))
- #### CC 5.0 or later
- #### Inlining appears to cause link problems with early releases of
- #### CC 5.0.
- ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
- inline = 0
- else
- ifeq (C++ 5.1 ,$(findstring C++ 5.1 ,$(CC_VERSION)))
- inline = 0
- else # ! 5.1
- inline ?= 1
- endif # 5.2 or greater
- endif #! 5.0
-
- CCFLAGS += $(CFLAGS)
-
- #### If compat=4 is desired, set up for that. There are syntactic diffs
- #### in the compatibility modes, but here all we need to be concerned with
- #### is turning on -compat=4, and not trying to enable the new libraries.
- ifeq ($(compat4),1)
- CCFLAGS += -compat=4
- CCFLAGS += -features=rtti
- else
- ifneq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
- # If 64-bit build is desired, turn that on. If no code gen options
- # are given to Forte 6, the default build is 32-bit, even when
- # building on a 64-bit system. Specifying xarch=v9 generates code
- # that runs on any Sparc v9 (64-bit) processor.
- # Beginning at (I believe) Studio 10 (C++ 5.7) there's a
- # -xarch=generic64 option that works for both Sparc and x86.
- # If you want to tune this further, you should extract and insert
- # from CCFLAGS in a private platform_macros.GNU file.
- ifeq (64,$(buildbits))
- ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION)))
- CFLAGS += -xarch=generic64
- LDFLAGS += -xarch=generic64
- else
- ifeq (C++ 5.8,$(findstring C++ 5.8,$(CC_VERSION)))
- CFLAGS += -xarch=generic64
- LDFLAGS += -xarch=generic64
- else
- # Starting at Studio 12 (CC 5.9), -m64 is used in place of -xarch
- ifeq (1,$(STUDIO_12_OR_BETTER))
- CFLAGS += -m64
- LDFLAGS += -m64
- else
- CFLAGS += -xarch=v9
- LDFLAGS += -xarch=v9
- endif # C++ 5.9+
- endif # C++ 5.8
- endif # C++ 5.7
- endif # buildbits
- endif # CC 5.0
- endif # compat4 requested
-endif # CC 5.0 or later
-
-ifeq ($(shared_libs), 1)
- ifneq ($(static_libs_only), 1)
- # Take advantage of Sun Studio 8 (v5.5) symbol scopes to
- # generate improved shared library binaries.
- ifeq ($(STUDIO_8_OR_BETTER),1)
- ifneq ($(no_hidden_visibility),1)
- CCFLAGS += -xldscope=hidden
- else
- CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0
- endif # no_hidden_visibility
- endif # Sun Studio 8 (C++ 5.5) or better.
- endif # static_libs_only
-endif # shared_libs
-
-LD = $(CXX)
-ifeq ($(distrib),0)
- LDFLAGS += -R $(ACE_ROOT)/lib -R./
-endif
-
-# Get common Solaris settings
-include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU
-
-LIBS += -lsocket -lrt -laio -ldl -lnsl -lgen -lposix4 -ladm
-
-# Support alternate CC libraries (i.e. STLport, Tools.h++, Cstd)
-# See: http://docs.sun.com/app/docs/doc/820-7599/bkaty?a=view
-ifeq ($(stlport),1)
- CC_LIBRARY = stlport4
- PLATFORM_STLPORT_CCFLAGS += -library=$(CC_LIBRARY)
- PLATFORM_STLPORT_LDFLAGS += -library=$(CC_LIBRARY)
-else
- ifeq ($(rwtools),1)
- ifeq ($(stdcpplib),1)
- CC_LIBRARY = rwtools7_std
- else
- CC_LIBRARY = rwtools7,iostream
- CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
- endif
- else # default
- ifeq ($(stdcpplib),1)
- CC_LIBRARY = Cstd
- else
- CC_LIBRARY = no%Cstd,iostream
- CPPFLAGS += -DACE_USES_OLD_IOSTREAMS
- endif
- endif
- CCFLAGS += -library=$(CC_LIBRARY)
- LDFLAGS += -library=$(CC_LIBRARY)
-endif
-
-### CC 5.10 enables annotation support by default; allow user to override
-### new behavior. This also provides a work around for 64-bit linker crashes,
-### see: http://defect.opensolaris.org/bz/show_bug.cgi?id=9720
-ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION)))
- ifeq ($(no_annotations),1)
- LDFLAGS += -xannotate=no
- endif
-endif
-
-LDFLAGS += -xildoff
-ifeq ($(pthreads),1)
- CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
-endif
-OCFLAGS += -xO4
-PIC = -KPIC
-AR = CC
-ARFLAGS = -xar -o
-RANLIB = echo
-SOFLAGS += -G $(CPPFLAGS)
-
-# The correct flags to pass to the linker for ELF dynamic shared library
-# versioning. This knows that wrapper_macros.GNU will set versioned_so to
-# 1 if it's not set. So, the only way SOFLAGS should _not_ get this is if
-# versioned_so has been explicitly disabled.
-#
-ifeq ($(versioned_so),1)
- SOFLAGS += -h $(SONAME)
-endif
-
-ifdef CLEANUP_BIN
- #### Builds .shobj/$*.o file, then .shobj/$*.so file. The .o files
- #### are used for building libraries and executables. But, it seems
- #### to be necessary to build the .so files (with -G) in order to get
- #### all template instantiations.
- SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-else
- #### Optimize builds when no executables are built in the current
- #### directory. Only a library is being created, and -G is used
- #### in that step. Therefore, all templates instantations are
- #### included in the library. This optimization saves almost 11 Mb
- #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE
- #### build on a 168 MHz Sun Ultra2.
- ####
- #### Sun C++ won't allow the output from a compile to be named with
- #### a .so extension. Rather than muck with the ACE build rules and
- #### risk upsetting builds on other platforms, just ln the output
- #### after building it.
- SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- /bin/ln $(VSHDIR)$*.o $@
-endif # CLEANUP_BIN
diff --git a/ACE/include/makeinclude/platform_vxworks6.6.GNU b/ACE/include/makeinclude/platform_vxworks6.6.GNU
index a8ad549cf05..9f00cbd6941 100644
--- a/ACE/include/makeinclude/platform_vxworks6.6.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.6.GNU
@@ -6,10 +6,6 @@ endif # VXWORKS_VERSION_FLAG
include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.5.GNU
-ifeq ("$(WIND_HOST_TYPE)","sun4-solaris2")
- override RM=rm -f
-endif # sun4-solaris2
-
# Disable strict aliasing warnings, these are given on some VxWorks system
# header files and has been reported to WindRiver
ifeq ("$(TOOL_FAMILY)","gnu")
diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU
index 9fb934580cb..3da9b1b5eaa 100644
--- a/ACE/include/makeinclude/rules.bin.GNU
+++ b/ACE/include/makeinclude/rules.bin.GNU
@@ -1,7 +1,7 @@
# -*- Makefile -*-
#----------------------------------------------------------------------------
-#
+#
#
# Build binaries
# GNU version
@@ -35,18 +35,12 @@ PSRC += $(addsuffix .cpp, $(CLEANUP_BIN))
CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT))
VXWORKSLINK ?=
-using_aix_vacpp ?=
ifeq ($(VXWORKSLINK),1)
$(ARCH_BIN): $(DEFAULTRULE)
mv $(DEFAULTRULE) $@
else # !VXWORKSLINK
- ifeq (1,$(using_aix_vacpp))
-$(ARCH_BIN): %: %.icc $(SRC)
- vacbld_r $< -severitylevel=warning
- else # !using_aix_vacpp
# Since we add in the vdir, don't use arch_bin. use bin instead!
$(ARCH_BIN): %: $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)
$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
- endif # using_aix_vacpp
endif
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 1a84f3d92cd..6b8c2e8fc13 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -137,7 +137,6 @@ ifneq ($(INSLIB),)
endif # INSLIB
ace_lib_prelink ?= 0
-aix_build ?= 0
ifeq (1,$(VXWORKS))
@@ -187,25 +186,11 @@ $(VLIB): $(VLOBJS)
#### to lib files, for example.
-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
endif # ace_lib_prelink
- ifeq (1,$(ACE_OPENVMS))
- find $(TMPINCDIR:%=%) -name "*.$(OBJEXT)" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
- else
- ifneq (,$(AR.cc.override))
+ ifneq (,$(AR.cc.override))
$(AR.cc.override)
else
([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \
echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
- endif
- endif
- ifdef ibmcxx_build
-# This is required to get AIX IBM C/C++ to instantiate and compile the needed
-# templates.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \
- $(RM) dummy; \
- $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \
- fi
endif
-chmod a+r $@
ifneq (,$(RANLIB))
@@ -214,55 +199,19 @@ $(VLIB): $(VLOBJS)
endif # !VXWORKS
-# Note that if you don't want to build shared libraries, just remove the
-# $(VSHOBJS)
-#
-# The AIX shr.o build is out here to keep it away from the SOVERSION stuff.
-# The SOVERSION transform is applied after building the library file.
-ifeq (1,$(aix_build))
-shr.o: $(VSHOBJS)
- $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
-
-.INTERMEDIATE: shr.o
-endif # aix_build
-
ifeq ($(VXWORKSLINK),1)
$(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out
-$(RM) $@
-$(LN_S) $(PROJECT_OUT) $@
-$(POST_BUILD_RULE)
else # !VXWORKSLINK
- ifeq (1,$(aix_build))
-$(VSHLIB): shr.o
- $(AR) $(ARFLAGS) $@ $?
- ifneq (,$(RANLIB))
- -$(RANLIB) $@
- endif # RANLIB
- else # ! aix_build
$(VSHLIB): $(VSHOBJS)
- ifdef PRELIB
+ ifdef PRELIB
$(PRELIB)
- endif # PRELIB
- ifdef ibmcxx_build
- # This is required to get AIX IBM C/C++ to instantiate and compile the needed
- # templates before building the library.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \
- $(RM) dummy; \
- fi
- endif # ibmcxx_build
- ifdef SHLIBBUILD
+ endif # PRELIB
+ ifdef SHLIBBUILD
$(SHLIBBUILD)
else # ! SHLIBBUILD
- ifdef ibmcxx_build
- if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \
- then \
- $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
- else \
- $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
- fi
- else # !ibmcxx_build
ifeq (1,$(ace_lib_prelink))
#### Attempt a link (which will fail), to add template instantiations
#### to lib files, for example.
@@ -273,9 +222,7 @@ $(VSHLIB): $(VSHOBJS)
else
$(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
endif #override
- endif # ibmcxx_build
- endif # SHLIBBUILD
- endif # aix_build
+ endif # SHLIBBUILD
endif # VXWORKSLINK
ifneq ($(SOVERSION),)
# This carefully works with both ARCH (where VSHLIB_* refer to the ARCH
diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU
index 11283525473..d2da721b3f1 100644
--- a/ACE/include/makeinclude/rules.local.GNU
+++ b/ACE/include/makeinclude/rules.local.GNU
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#----------------------------------------------------------------------------
-#
+#
#
# Local targets
# GNU version
@@ -27,20 +27,9 @@ ifdef TEMPINCDIR
CLEANUP_DIRS += $(TEMPINCDIR)
endif
-ifdef sun
- CLEANUP_DIRS += SunWS_cache
-endif
-
vxworks_ntbuild ?= 0
lacks_touch ?= 0
-#### TEMPLATE_REPOSITORY can be set in individual platform files
-#### to create template repository directories. See
-#### platform_sunos5_sunc++.GNU for an example.
-ifdef TEMPLATE_REPOSITORY
-CLEANUP_DIRS += $(TEMPLATE_REPOSITORY)
-endif
-
ifeq ($(use_pwd_call),)
ifneq ($(mingw32),1)
use_pwd_call := 0
@@ -369,7 +358,7 @@ ifneq ($(SHLIB_UNCHECKED),)
-$(RM) $(SHLIB_UNCHECKED)
ifeq ($(versioned_so),1)
-$(RM) $(SHLIB_UNCHECKED)$(SOVERSION)
-else
+else
ifeq ($(versioned_so),2)
-$(RM) $(SHLIB_UNCHECKED:.$(SOEXT)=$(SOVERSION).$(SOEXT))
endif
@@ -510,7 +499,7 @@ depend.local: $(MAKEFILE) idl_stubs.local
@$(RM) $(DEPENDENCY_FILE).old
@cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old
$(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(DEPENDENCY_FILE) \
- $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC)
+ $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC)
@if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\
then echo "GNUmakefile dependencies unchanged." ;\
else \
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index f9888281467..d815f614662 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -26,7 +26,6 @@
# to CPPFLAGS, PLATFORM_DMALLOC_LDFLAGS to LDFLAGS, and
# PLATFORM_DMALLOC_LIBS to LIBS. For more information on
# dmalloc, see http://dmalloc.com.
-# fast Enable -fast option, e.g., with Sun C++.
# inline Enable ACE inlining. Some platforms enable inlining by
# default, others do not. If platform_macros.GNU does not
# set this, inline is enabled.
@@ -224,7 +223,6 @@ endif # alternate_platform_macros
# Define some variables to silence warnings
GHS ?=
-AIX_TEMPLATE_HACK ?=
# $(ACE_PLATFORM_CONFIG) is used in dependency rules and corresponds to the
# platform dependent config-*.h file included in config.h, and can be set
@@ -843,10 +841,6 @@ ifdef quantify
PURELINK += quantify -best-effort -cache-dir=$(PURE_CACHE_DIR) \
-max_threads=100 $(PLATFORM_QUANTIFY_OPTIONS)
CPPFLAGS += -DACE_HAS_QUANTIFY -I$(ACE_QUANTIFY_DIR)
-
- ifeq ($(shell uname -p),sparc)
- PURELINK += -record-register-window-traps
- endif # sparc
endif # quantify
repo ?=
View Lorry Controller Status