diff --git a/config/CONFIG.Host.alpha b/config/CONFIG.Host.alpha deleted file mode 100644 index 63d61dc91..000000000 --- a/config/CONFIG.Host.alpha +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# CONFIG.Host.alpha -# -# This file is maintained by the EPICS community. -# Sites may override these definitions in CONFIG_SITE.Host.alpha - -ARCH_CLASS = alpha - -# Include definitions common to all Unix archs -include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon - -AR = ar - -# Configure OS vendor C compiler -ACC = cc -ACC_ANSI = $(ACC) -std -ACC_STRICT = $(ACC) -std1 -ACC_TRAD = $(ACC) -std0 -ACC_WARN_YES = -ACC_WARN_NO = -w -ACC_OPT_YES = -O -ACC_OPT_NO = -g -ACC_SFLAGS_YES= -non_shared -ACC_SFLAGS_NO= -call_shared -ACC_SLIBS_YES = -ACC_SLIBS_NO= -ACC_SHRLIB_CFLAGS_YES = -ACC_SHRLIB_LDFLAGS_YES = -shared - -# Configure OS vendor C++ compiler -CCC = cxx -CCC_NORMAL = $(CCC) -CCC_STRICT = $(CCC) -CCC_TEMPL_INST_FLAG = -DEXPL_TEMPL -CCC_WARN_YES = -CCC_WARN_NO = -CCC_OPT_YES = -O -CCC_OPT_NO = -g -CCC_SFLAGS_YES= -CCC_SFLAGS_NO= -CCC_SLIBS_YES = -CCC_SLIBS_NO= -CCC_SHRLIB_CFLAGS_YES = -CCC_SHRLIB_LDFLAGS_YES = -shared -CCC_DEPENDS_FLAG = - -ARCH_DEP_CFLAGS = -D_OSF_SOURCE -ARCH_DEP_LDLIBS = - diff --git a/config/CONFIG.Host.osf-alpha b/config/CONFIG.Host.osf-alpha deleted file mode 100644 index 7a4330165..000000000 --- a/config/CONFIG.Host.osf-alpha +++ /dev/null @@ -1,13 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# $Revision-Id$ - -# osf-alpha is the new name for alpha --include $(EPICS_BASE)/config/CONFIG.Host.alpha diff --git a/config/CONFIG.Host.osf-alpha-gnu b/config/CONFIG.Host.osf-alpha-gnu deleted file mode 100644 index aedfe0250..000000000 --- a/config/CONFIG.Host.osf-alpha-gnu +++ /dev/null @@ -1,20 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# $Revision-Id$ - -# osf-alpha is the new name for alpha --include $(EPICS_BASE)/config/CONFIG.Host.alpha - -#========================== -# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE -ANSI=GCC -CPLUSPLUS=G++ -#========================== - diff --git a/config/CONFIG_COMPAT b/config/CONFIG_COMPAT index deb091582..0c3a76753 100644 --- a/config/CONFIG_COMPAT +++ b/config/CONFIG_COMPAT @@ -24,7 +24,6 @@ ARCH_Linux = linux-x86 ARCH_freebsd = freebsd-x86_64 ARCH_WIN32 = win32-x86 ARCH_hp700 = hpux-parisc -ARCH_alpha = osf-alpha ARCH_Borland = win32-x86-borland ARCH_cygwin32 = cygwin-x86 diff --git a/config/CONFIG_HOST_ARCH.alpha b/config/CONFIG_HOST_ARCH.alpha deleted file mode 100644 index 1936bad93..000000000 --- a/config/CONFIG_HOST_ARCH.alpha +++ /dev/null @@ -1,17 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# CONFIG_HOST_ARCH.alpha -# - -# Include definitions common to all Unix archs -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon - -WIND_HOST_TYPE = alpha - diff --git a/config/CONFIG_HOST_ARCH.osf-alpha b/config/CONFIG_HOST_ARCH.osf-alpha deleted file mode 100644 index c7306ab83..000000000 --- a/config/CONFIG_HOST_ARCH.osf-alpha +++ /dev/null @@ -1,13 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -# $Revision-Id$ - -# osf-alpha is the new name for alpha --include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.alpha diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE index 8ab794dbe..15ca204cf 100644 --- a/config/CONFIG_SITE +++ b/config/CONFIG_SITE @@ -16,7 +16,6 @@ # Borland # Linux # WIN32 -# alpha # cygwin32 # hp700 # sgi diff --git a/configure/os/CONFIG.Common.osf-alpha b/configure/os/CONFIG.Common.osf-alpha deleted file mode 100644 index 067add4f4..000000000 --- a/configure/os/CONFIG.Common.osf-alpha +++ /dev/null @@ -1,43 +0,0 @@ -# CONFIG.Common.osf-alpha -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha target archs -# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha -#------------------------------------------------------- - -# Include definitions common to all Unix targets -include $(CONFIG)/os/CONFIG.Common.UnixCommon - -OS_CLASS = osf -ARCH_CLASS = alpha - -CODE_CPPFLAGS = - -POSIX_CPPFLAGS += -pthread -ieee -# Unknown reason why this doesn't work in POSIX_LDFLAGS: -POSIX_LDLIBS += -pthread -ieee - -OP_SYS_CPPFLAGS += -D_OSF_SOURCE -OP_SYS_LDLIBS += -lrt -# Unknown reason why USR_SYS_LIBS += m is needed -USR_SYS_LIBS += m - -space:=$(empty) $(empty) -colon := : - -# Set runtime path for shared libraries -SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-rpath %) -SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - -# Set runtime path for products -PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-rpath %) -PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - -ifdef CROSS - GNU_TARGET=alpha-osf - CMPLR_SUFFIX= - CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET)) -endif - diff --git a/configure/os/CONFIG.Common.osf-alpha-gnu b/configure/os/CONFIG.Common.osf-alpha-gnu deleted file mode 100644 index 42da607bc..000000000 --- a/configure/os/CONFIG.Common.osf-alpha-gnu +++ /dev/null @@ -1,40 +0,0 @@ -# CONFIG.Common.osf-alpha-gnu -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha target archs -# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha-gnu -#------------------------------------------------------- - -# Include definitions common to all Unix targets -include $(CONFIG)/os/CONFIG.Common.UnixCommon - -OS_CLASS = osf -ARCH_CLASS = alpha - -CODE_CPPFLAGS = - -POSIX_CPPFLAGS += -D_REENTRANT -POSIX_LDLIBS += -lpthread -lexc - -OP_SYS_CPPFLAGS += -D_OSF_SOURCE -OP_SYS_LDLIBS += -lrt - -space:=$(empty) $(empty) -colon := : - -# Set runtime path for shared libraries -SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%) -SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - -# Set runtime path for products -PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%) -PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - -ifdef CROSS - GNU_TARGET=alpha-osf - CMPLR_SUFFIX= - CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET)) -endif - diff --git a/configure/os/CONFIG.osf-alpha-gnu.Common b/configure/os/CONFIG.osf-alpha-gnu.Common deleted file mode 100644 index e420fbc17..000000000 --- a/configure/os/CONFIG.osf-alpha-gnu.Common +++ /dev/null @@ -1,12 +0,0 @@ -# CONFIG.osf-alpha-gnu.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha host archs -# Sites may override these definitions in CONFIG_SITE.osf-alpha-gnu.Common -#------------------------------------------------------- - -#Include definitions common to unix hosts -include $(CONFIG)/os/CONFIG.UnixCommon.Common - diff --git a/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu b/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu deleted file mode 100644 index 31a79b84b..000000000 --- a/configure/os/CONFIG.osf-alpha-gnu.osf-alpha-gnu +++ /dev/null @@ -1,40 +0,0 @@ -# CONFIG.osf-alpha-gnu.osf-alpha-gnu -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha host archs -# Sites may override these definitions in CONFIG_SITE.osf-alpha-gnu.osf-alpha-gnu -#------------------------------------------------------- - -CC = gcc -CCC = g++ -CPP = $(CC) -E -RANLIB = -AR = ar -r -LD = -r - -# Configure OS vendor C compiler -CODE_CFLAGS = -WARN_CFLAGS_YES = -WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -O -OPT_CFLAGS_NO = -g - -# Configure OS vendor C++ compiler -PROF_CXXFLAGS_YES = +p -PROF_CXXFLAGS_NO = -CODE_CXXFLAGS = -WARN_CXXFLAGS_YES = -WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = -O -OPT_CXXFLAGS_NO = -g - -STATIC_LDFLAGS_YES= -Bstatic -STATIC_LDFLAGS_NO= -STATIC_LDLIBS_YES= -Bdynamic -STATIC_LDLIBS_NO= - -SHRLIB_LDFLAGS = -shared -LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS) - diff --git a/configure/os/CONFIG.osf-alpha.Common b/configure/os/CONFIG.osf-alpha.Common deleted file mode 100644 index e56b10418..000000000 --- a/configure/os/CONFIG.osf-alpha.Common +++ /dev/null @@ -1,12 +0,0 @@ -# CONFIG.osf-alpha.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha host archs -# Sites may override these definitions in CONFIG_SITE.osf-alpha.Common -#------------------------------------------------------- - -#Include definitions common to unix hosts -include $(CONFIG)/os/CONFIG.UnixCommon.Common - diff --git a/configure/os/CONFIG.osf-alpha.osf-alpha b/configure/os/CONFIG.osf-alpha.osf-alpha deleted file mode 100644 index ecabbfc8a..000000000 --- a/configure/os/CONFIG.osf-alpha.osf-alpha +++ /dev/null @@ -1,44 +0,0 @@ -# CONFIG.osf-alpha.osf-alpha -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for osf-alpha host archs -# Sites may override these definitions in CONFIG_SITE.osf-alpha.osf-alpha -#------------------------------------------------------- - -CC = cc -CCC = cxx -CPP = $(CC) -E -RANLIB = -AR = ar -r -LD = -r - -# Configure OS vendor C compiler -CODE_CFLAGS = -WARN_CFLAGS_YES = -WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -O -OPT_CFLAGS_NO = -g - -# Configure OS vendor C++ compiler -PROF_CXXFLAGS_YES = +p -PROF_CXXFLAGS_NO = -CODE_CXXFLAGS = -WARN_CXXFLAGS_YES = -WARN_CXXFLAGS_NO = -OPT_CXXFLAGS_YES = -O -OPT_CXXFLAGS_NO = -g - -STATIC_LDFLAGS_YES= -Bstatic -STATIC_LDFLAGS_NO= -STATIC_LDLIBS_YES= -Bdynamic -STATIC_LDLIBS_NO= - -SHRLIB_LDFLAGS = -shared -LOADABLE_SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS) - -############# ??????????? -#####ACC_SFLAGS_YES= -non_shared -#####ACC_SFLAGS_NO= -call_shared - diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT index 38fc1335c..525be75d4 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_alpha = osf-alpha ARCH_cygwin32 = cygwin-x86 ARCH_Borland = win32-x86-borland ARCH_freebsd = freebsd-x86 diff --git a/documentation/README.tru64unix b/documentation/README.tru64unix deleted file mode 100644 index 87339a5f9..000000000 --- a/documentation/README.tru64unix +++ /dev/null @@ -1,78 +0,0 @@ -Compiling EPICS and Building IOC Applications on Tru64Unix/Alpha - (former Digital-Unix, and even former OSF1) - for architectures "osf-alpha" and "osf-alpha-gnu" - -====================================================================== - -Tools needed ------------- - -For C/C++ Compiler, you need one of these compiler set. - - - DEC/Compaq/HP's ANSI C/C++ compilers for "osf-alpha" - I used - cc -V - Compaq C V6.5-303 (dtk) on Compaq Tru64 UNIX V5.1B (Rev. 2650) - Compiler Driver V6.5-302 (dtk) cc Driver - cxx -V - Compaq C++ V6.5-042 for Compaq Tru64 UNIX V5.1B (Rev. 2650) - Compiler Driver V6.5-042 (cxx) cxx Driver - - - GNU gcc/g++ compiler for "osf-alpha-gnu" - I used - gcc --version - gcc (GCC) 3.4.3 - -Environment ------------ - -Before compiling, please set the environment variable EPICS_HOST_ARCH -dependent on your compiler. - - for cc/cxx - setenv EPICS_HOST_ARCH osf-alpha - (setenv EPICS_HOST_ARCH `startup/EpicsHostArch.pl`) - export EPICS_HOST_ARCH=osf-alpha - - for gcc/g++ - setenv EPICS_HOST_ARCH osf-alpha-gnu - (setenv EPICS_HOST_ARCH `startup/EpicsHostArch.pl gnu`) - export EPICS_HOST_ARCH=osf-alpha-gnu - -Building --------- - -Should be quite straightforward. Edit (if necessary) the CONFIG_SITE -files and "make". (Be sure that GNU make is in your path or call it -explicitly as the standard make on Tru64Unix is _not_ GNU.) - -For example (with csh): - setenv EPICS_HOST_ARCH `startup/EpicsHostArch.pl` - make |& tee ../make-base-osf.log - make runtests | & tee ../test-base-osf.log - setenv EPICS_HOST_ARCH `startup/EpicsHostArch.pl gnu` - make |& tee ../make-base-osfgnu.log - -Minor errors are detected in and timer. They should be investigated -later. - -Some internals ------------------------ - -__alpha is used to distinguish this architecture from others. -__DECCXX is used to distinguish DEC/Compaq/HP C++ compiler from GNU's. -There are several ways to specify compiler options for pthread. - Please consult the pthread(3) manual page. -src/libCom/osi/os/osf is used for osi definitions, - src/libCom/osi/os/alpha is not used. -About 230 warning messages with cc/cxx, and 4 with gcc. Sometimes - errors from cxx are intuitive. -I just started to use IOC application for a gateway purpose. There - can be architecture-dependent problems, that I didn't find yet. - -Only several lines in configure and src files were modified from - base-3.14.4/5/6/7/8/8.2/9pre. Thanks the core team for keeping - the alpha-osf dependent part in the distribution. - - -Kazuro Furukawa diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 66cbfbe2f..00a4f730e 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -13,6 +13,12 @@

Changes between 3.14.11 and 3.14.12

+

Deleted osf-alpha targets

+ +

Kazuro Furukawa has been unable to compile EPICS Base on this target for the +last few releases and it's not really needed any more, so the targets have been +deleted from this release.

+

Expanded CALC expressions

The calc and calcout records can now accept infix expressions up to 79 diff --git a/src/libCom/osi/os/osf/epicsMath.h b/src/libCom/osi/os/osf/epicsMath.h deleted file mode 100644 index 03b7cf4ba..000000000 --- a/src/libCom/osi/os/osf/epicsMath.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE is distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ - -#ifndef epicsMathh -#define epicsMathh - -#include -#include - -#define isinf(D) (!finite((D)) && !(isnan((D)))) - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareExtern float epicsNAN; -epicsShareExtern float epicsINF; - -#ifdef __cplusplus -} -#endif - -#endif /* epicsMathh */ diff --git a/src/libCom/osi/os/osf/osdSock.h b/src/libCom/osi/os/osf/osdSock.h deleted file mode 100644 index 772d3d3ff..000000000 --- a/src/libCom/osi/os/osf/osdSock.h +++ /dev/null @@ -1,73 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ - -/* - * alpha specific socket include - */ - -#ifndef osdSockH -#define osdSockH - -#ifdef __cplusplus -extern "C" { -struct ifafilt; -#endif - -#include - -#include -#include /* for MAXHOSTNAMELEN */ -#include -#include -#include -/* #include */ -/* #include */ -#include -#include -#include -#include -#include -#include /* close() and others */ - -#ifdef __cplusplus -} -#endif - -typedef int SOCKET; -#define INVALID_SOCKET (-1) -#define SOCKERRNO errno -#define socket_ioctl(A,B,C) ioctl(A,B,C) -typedef int osiSockIoctl_t; -typedef int osiSocklen_t; - -#define FD_IN_FDSET(FD) ((FD)=0) - -#define SOCK_EWOULDBLOCK EWOULDBLOCK -#define SOCK_ENOBUFS ENOBUFS -#define SOCK_ECONNRESET ECONNRESET -#define SOCK_ETIMEDOUT ETIMEDOUT -#define SOCK_EADDRINUSE EADDRINUSE -#define SOCK_ECONNREFUSED ECONNREFUSED -#define SOCK_ECONNABORTED ECONNABORTED -#define SOCK_EINPROGRESS EINPROGRESS -#define SOCK_EISCONN EISCONN -#define SOCK_EALREADY EALREADY -#define SOCK_EINVAL EINVAL -#define SOCK_EINTR EINTR -#define SOCK_EPIPE EPIPE -#define SOCK_EMFILE EMFILE -#define SOCK_SHUTDOWN ESHUTDOWN -#define SOCK_ENOTSOCK ENOTSOCK -#define SOCK_EBADF EBADF - -#define ifreq_size(pifreq) (sizeof(pifreq->ifr_name)) - -#endif /*osdSockH*/ - diff --git a/src/libCom/osi/os/osf/osiFileName.h b/src/libCom/osi/os/osf/osiFileName.h deleted file mode 100644 index b79203992..000000000 --- a/src/libCom/osi/os/osf/osiFileName.h +++ /dev/null @@ -1,21 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* - * osiFileName.h - * Author: Jeff Hill - * - * - */ -#ifndef osiFileNameH -#define osiFileNameH - -#include "unixFileName.h" - -#endif /* osiFileNameH */ diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.osf-alpha.osf-alpha b/src/makeBaseExt/top/configure/os/CONFIG_SITE.osf-alpha.osf-alpha deleted file mode 100644 index fc36212cc..000000000 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.osf-alpha.osf-alpha +++ /dev/null @@ -1,28 +0,0 @@ -# -# $Revision-Id$ -# -# Site Specific Configuration Information -# Only the local epics system manager should modify this file - -# Where to find utilities/libraries -# If you do not have a certain product, -# leave the line empty. -# - --include $(TOP)/configure/os/CONFIG_SITE.Common.Common - -# Where to find utilities/libraries -X11_LIB = /usr/lib -X11_INC = /usr/include -MOTIF_INC = /usr/include -MOTIF_LIB = /usr/lib -INTERVIEWS_BIN=/usr/local/interviews/bin/O.alpha -OPENWIN = -WINGZ = -MATHEMATICA = -XRTGRAPH = /usr/local/xrtgraph -QUESTWIN = -IDL = -JAVA_DIR=/usr/local/java -JAVA_INC=$(JAVA_DIR)/include - diff --git a/startup/EpicsHostArch b/startup/EpicsHostArch index 375df8a7f..ae25ea7cd 100755 --- a/startup/EpicsHostArch +++ b/startup/EpicsHostArch @@ -24,38 +24,24 @@ sysname=`uname` case $sysname in Linux ) os=linux - cpu=`uname -m` + cpu=`uname -m` case $cpu in i386 | i486 | i586 | i686 ) cpu=x86 - ;; - esac + ;; + esac if [ ${cpu} = "x86_64" ]; then cpu=x86_64 - fi - echo ${os}-${cpu}${suffix} + fi + echo ${os}-${cpu}${suffix} ;; Darwin ) os=darwin - cpu=`uname -m` + cpu=`uname -m` case "$cpu" in "Power Macintosh") cpu=ppc ;; "i386") cpu=x86 ;; esac - echo ${os}-${cpu}${suffix} - ;; - HP-UX ) - os=hpux - cpu=`uname -m` - case $cpu in - 9000/[346]??) cpu=m68k ;; - 9000/[78]??) cpu=parisc ;; - esac - echo ${os}-${cpu}${suffix} - ;; - OSF1 ) - os=osf - cpu=`uname -m` - echo ${os}-${cpu}${suffix} + echo ${os}-${cpu}${suffix} ;; SunOS ) version=`uname -r | sed '1s/^\([0-9]*\).*$/\1/'` @@ -64,16 +50,16 @@ case $sysname in else os=sun4 fi - cpu=`uname -m` + cpu=`uname -m` case $cpu in - sun4*) + sun4*) cpu=sparc - ;; + ;; i86pc) cpu=x86 - ;; - esac - echo ${os}-${cpu}${suffix} + ;; + esac + echo ${os}-${cpu}${suffix} ;; * ) sysname=`uname -o` diff --git a/startup/EpicsHostArch.pl b/startup/EpicsHostArch.pl index db3b8f506..169f9e32e 100755 --- a/startup/EpicsHostArch.pl +++ b/startup/EpicsHostArch.pl @@ -5,8 +5,7 @@ eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* @@ -27,14 +26,10 @@ sub GetEpicsHostArch { # no args $arch=$Config{'archname'}; if ($arch =~ /sun4-solaris/) { return "solaris-sparc"; } elsif ($arch =~ m/i86pc-solaris/) { return "solaris-x86"; - } elsif ($arch =~ m/sun4-sunos/) { return "sun4-68k"; } elsif ($arch =~ m/i[3-6]86-linux/) { return "linux-x86"; } elsif ($arch =~ m/x86_64-linux/) { return "linux-x86_64"; } elsif ($arch =~ m/MSWin32-x86/) { return "win32-x86"; } elsif ($arch =~ m/cygwin/) { return "cygwin-x86"; - } elsif ($arch =~ m/PA-RISC1.1/) { return "hpux-parisc"; - } elsif ($arch =~ m/PA-RISC2.0/) { return "hpux-parisc"; - } elsif ($arch =~ m/alpha-dec_osf/) { return "osf-alpha"; } elsif ($arch =~ m/darwin/) { my($kernel, $hostname, $release, $version, $cpu) = POSIX::uname(); if ($cpu =~ m/Power Macintosh/) { return "darwin-ppc"; }