Removed HPUX support

3 files changed, 3 insertions, 325 deletions

diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
index ac70c620b61..f3988c7db69 100644
--- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
@@ -80,14 +80,10 @@ templates ?= automatic
 versioned_so ?= 1
 with_ld ?=
 ifneq ($(versioned_so),0)
-  ifeq ($(with_ld),hpux)
-    SOFLAGS += -Wl,+h -Wl,$(SONAME)
+  ifeq ($(with_ld),aix)
+  # What to do here???
   else
-    ifeq ($(with_ld),aix)
-    # What to do here???
-    else
-      SOFLAGS += -Wl,-h -Wl,$(SONAME)
-    endif
+    SOFLAGS += -Wl,-h -Wl,$(SONAME)
   endif
 endif
 
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)