From c03f26d84ad6ddd356f169055b1363ddd2955cd1 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 24 Apr 2009 20:01:52 +0000 Subject: [PATCH] Deleted hpux, no longer supported --- configure/CONFIG_SITE | 2 - configure/Sample.Makefile | 4 +- configure/os/CONFIG.Common.hpux-parisc | 34 -------------- configure/os/CONFIG.Common.hpux-parisc-gnu | 11 ----- configure/os/CONFIG.hpux-parisc-gnu.Common | 12 ----- .../os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu | 26 ----------- configure/os/CONFIG.hpux-parisc.Common | 13 ------ configure/os/CONFIG.hpux-parisc.hpux-parisc | 45 ------------------- configure/os/CONFIG_COMPAT | 1 - configure/os/CONFIG_SITE.Common.hpux-parisc | 19 -------- .../os/CONFIG_SITE.Common.hpux-parisc-gnu | 13 ------ 11 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 configure/os/CONFIG.Common.hpux-parisc delete mode 100644 configure/os/CONFIG.Common.hpux-parisc-gnu delete mode 100644 configure/os/CONFIG.hpux-parisc-gnu.Common delete mode 100644 configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu delete mode 100644 configure/os/CONFIG.hpux-parisc.Common delete mode 100644 configure/os/CONFIG.hpux-parisc.hpux-parisc delete mode 100644 configure/os/CONFIG_SITE.Common.hpux-parisc delete mode 100644 configure/os/CONFIG_SITE.Common.hpux-parisc-gnu diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index e1fe3007b..10461f5ab 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -24,8 +24,6 @@ # darwin-ppcx86 (Universal binaries for both CPUs) # freebsd-x86 (GNU compiler used for host builds) # freebsd-x86_64 (GNU compiler used for host builds) -# hpux-parisc (HP compiler used for host builds) -# hpux-parisc-gnu (GNU compiler used for host builds) # linux-ppc (GNU compiler used for host builds) # linux-x86 (GNU compiler used for host builds) # linux-x86_64 (GNU compiler used for host builds) diff --git a/configure/Sample.Makefile b/configure/Sample.Makefile index f768b4809..a84ccbb45 100755 --- a/configure/Sample.Makefile +++ b/configure/Sample.Makefile @@ -63,9 +63,9 @@ a_file_CPPFLAGS_WIN32 = -DVERSION='WIN32 port' # again: if INC_$(OS_CLASS) is defined, it is added to INC, # otherwise INC_DEFAULT (if defined) is added: # -INC_DEFAULT = for_all_but_WIN32_or_hp700.h +INC_DEFAULT = for_all_but_WIN32_or_vxWorks.h INC_WIN32 = only_for_WIN32.h -INC_hpux = -nil- # hpux uses no special include +INC_vxWorks = -nil- # vxWorks uses no special include INC = file.h # -------------------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc deleted file mode 100644 index 93a1cee7b..000000000 --- a/configure/os/CONFIG.Common.hpux-parisc +++ /dev/null @@ -1,34 +0,0 @@ -# CONFIG.Common.hpux-parisc -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for hpux-parisc target archs -# Sites may override these definitions in CONFIG_SITE.Common.hpux-parisc -#------------------------------------------------------- - -#Include definitions common to unix targets -include $(CONFIG)/os/CONFIG.Common.UnixCommon - -OS_CLASS = hpux -ARCH_CLASS = parisc - -# Posix stuff is not set here as "-mt" (in CONFIG.hpux-parisc.hpux-parisc) -# does all defines and linker options to make posix threads work - -OP_SYS_CPPFLAGS = -DHP_UX -OP_SYS_CFLAGS = -D_HPUX_SOURCE -OP_SYS_CXXFLAGS = - -SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION)) -LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION)) - -# Set runtime path for shared libraries -empty:= # trick from the make docs... -space:= $(empty) $(empty) -SHRLIBDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(SHRLIB_DEPLIB_DIRS)),+s - -# Set runtime path for products -PRODDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(PROD_DEPLIB_DIRS)),+s - -GNU_TARGET=parisc-hp-unix diff --git a/configure/os/CONFIG.Common.hpux-parisc-gnu b/configure/os/CONFIG.Common.hpux-parisc-gnu deleted file mode 100644 index 93e356bc1..000000000 --- a/configure/os/CONFIG.Common.hpux-parisc-gnu +++ /dev/null @@ -1,11 +0,0 @@ -# CONFIG.Common.hpux-parisc-gnu -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for hpux-parisc gnu compiler target archs -# Sites may override these definitions in CONFIG_SITE.Common.hpux-parisc-gnu -#------------------------------------------------------- - -# Include definitions common to all hpux-parisc target archs -include $(CONFIG)/os/CONFIG.Common.hpux-parisc diff --git a/configure/os/CONFIG.hpux-parisc-gnu.Common b/configure/os/CONFIG.hpux-parisc-gnu.Common deleted file mode 100644 index 31ddb4942..000000000 --- a/configure/os/CONFIG.hpux-parisc-gnu.Common +++ /dev/null @@ -1,12 +0,0 @@ -# CONFIG.hpux-parisc-gnu.Common -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for hpux-parisc gnu compiler host builds -# Sites may override these definitions in CONFIG_SITE.hpux-parisc-gnu.Common -#------------------------------------------------------- - -#Include definitions common to hpux-parisc hosts -include $(CONFIG)/os/CONFIG.hpux-parisc.Common - diff --git a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu deleted file mode 100644 index 8a76607c8..000000000 --- a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu +++ /dev/null @@ -1,26 +0,0 @@ -# CONFIG.hpux-parisc-gnu.hpux-parisc-gnu -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for hpux-parisc gnu compiler host - hpux-parisc gnu compiler target builds -# Sites may override these definitions in CONFIG_SITE.hpux-parisc-gnu.hpux-parisc-gnu -#------------------------------------------------------- - -# Include common gnu compiler definitions -include $(CONFIG)/CONFIG.gnuCommon - -AR = ar -rc -RANLIB= -LD = ld -r - -STATIC_LDFLAGS_YES= -Wl,-a,archive -STATIC_LDFLAGS_NO = - -STATIC_LDLIBS_YES = -Wl,-a,default -STATIC_LDLIBS_NO = - -# Switch explicitly from default DCE threads to posix threads -POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L -USR_SYS_LIBS += pthread - diff --git a/configure/os/CONFIG.hpux-parisc.Common b/configure/os/CONFIG.hpux-parisc.Common deleted file mode 100644 index 7bbb7b614..000000000 --- a/configure/os/CONFIG.hpux-parisc.Common +++ /dev/null @@ -1,13 +0,0 @@ -# CONFIG.hpux-parisc.Common -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for hpux-parisc host archs -# Sites may override these definitions in CONFIG_SITE.hpux-parisc.Common -#------------------------------------------------------- - -#Include definitions common to unix hosts -include $(CONFIG)/os/CONFIG.UnixCommon.Common - -WIND_HOST_TYPE = parisc-hpux10 diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc deleted file mode 100644 index e896e2b87..000000000 --- a/configure/os/CONFIG.hpux-parisc.hpux-parisc +++ /dev/null @@ -1,45 +0,0 @@ -# CONFIG.hpux-parisc.hpux-parisc -# -# $Id$ -# This file is maintained by the build community. -# -# Definitions for host hpux-parisc - target hpux-parisc builds -# Sites may override these definitions in CONFIG_SITE.hpux-parisc.hpux-parisc -#------------------------------------------------------- - -CC = cc -CCC = aCC -CPP = $(CC) -E -RANLIB = -AR = ar -rc -LD = ld -r - -# Portability across different PA-RISC architecture versions -CODE_CFLAGS = +DAportable +z -WARN_CFLAGS_YES = -WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -O -OPT_CFLAGS_NO = -g - -CXXCMPLR=STRICT - -# Selective filter for getting rid of bogus compiler warnings -COMPILE_FILTER.cpp = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl - -# Portability across different PA-RISC architecture versions -CODE_CXXFLAGS = +DAportable +z -WARN_CXXFLAGS_YES = +w -WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = +O3 -OPT_CXXFLAGS_NO = -g - -STATIC_LDFLAGS_YES= -Wl,-a,archive -STATIC_LDFLAGS_NO = - -STATIC_LDLIBS_YES = -Wl,-a,default -STATIC_LDLIBS_NO = - -TARGET_LDFLAGS += -AA -mt - -SHRLIB_LDFLAGS = -b -LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS) diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT index cddf41bf7..539792b1d 100644 --- a/configure/os/CONFIG_COMPAT +++ b/configure/os/CONFIG_COMPAT @@ -13,7 +13,6 @@ ARCH_solarisGnu = solaris-sparc-gnu ARCH_Linux = linux-x86 ARCH_Darwin = darwin-ppc ARCH_WIN32 = win32-x86 -ARCH_hp700 = hpux-parisc ARCH_alpha = osf-alpha ARCH_cygwin32 = cygwin-x86 ARCH_Borland = win32-x86-borland diff --git a/configure/os/CONFIG_SITE.Common.hpux-parisc b/configure/os/CONFIG_SITE.Common.hpux-parisc deleted file mode 100644 index 62f142f77..000000000 --- a/configure/os/CONFIG_SITE.Common.hpux-parisc +++ /dev/null @@ -1,19 +0,0 @@ -# CONFIG_SITE.Common.hpux-parisc -# -# $Id$ -# -# Site Specific definitions for hpux-parisc target -# Only the local epics system manager should modify this file - -# NOTE: If SHARED_LIBRARIES=YES (now the default) then -# a) Environment variable SHLIB_PATH must include the full absolute pathname -# to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) (or wherever you install -# the EPICS shared libraries on your system) when invoking base -# executables, or -# b) Add the path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS below, which will burn -# the runtime search path into the executables. -#SHARED_LIBRARIES=YES - -# This is the absolute path to the generic INSTALL_LOCATION, for SHARED_LIBRARY searches. -SHRLIB_DEPLIB_DIRS += /opt/epics/R$(EPICS_SHORT_VERSION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_PATCH_LEVEL)$(EPICS_CVS_SNAPSHOT)$(EPICS_SITE_VSTRING)/lib/$(EPICS_HOST_ARCH) -PROD_DEPLIB_DIRS += /opt/epics/R$(EPICS_SHORT_VERSION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_PATCH_LEVEL)$(EPICS_CVS_SNAPSHOT)$(EPICS_SITE_VSTRING)/lib/$(EPICS_HOST_ARCH) diff --git a/configure/os/CONFIG_SITE.Common.hpux-parisc-gnu b/configure/os/CONFIG_SITE.Common.hpux-parisc-gnu deleted file mode 100644 index efe52e56d..000000000 --- a/configure/os/CONFIG_SITE.Common.hpux-parisc-gnu +++ /dev/null @@ -1,13 +0,0 @@ -# CONFIG_SITE.Common.hpux-parisc-gnu -# -# $Id$ -# -# Site Specific definitions for hpux-parisc-gnu target -# Only the local epics system manager should modify this file - -# Include definitions for hpux-parisc, as gnu builds will use the HP linker -include $(CONFIG)/os/CONFIG_SITE.Common.hpux-parisc - -# If you have built the GNU suite yourself, set the install location here, -# else the default (/usr/local) will be used -#GNU_DIR = /opt/gcc