remove HPUX

GlobalArrays · Jul 27, 2024 · 3d1aaf0 · 3d1aaf0
1 parent 3fc800b
commit 3d1aaf0
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 114 deletions.
diff --git a/armci/src/include/copy.h b/armci/src/include/copy.h
@@ -23,7 +23,7 @@
    EXTERN long long _armci_vec_sync_flag;
 #endif
 
-#if defined(FUJITSU) || defined(HPUX) || defined(SOLARIS) || defined(__ia64__) || defined(__crayx1)
+#if defined(FUJITSU) || defined(SOLARIS) || defined(__ia64__) || defined(__crayx1)
 #   define PTR_ALIGN
 #endif
 
@@ -258,7 +258,7 @@ void c_dcopy13_(const int*    const restrict rows,
 #if defined(AIX)
 #    define DCOPY2D c_dcopy2d_u_
 #    define DCOPY1D c_dcopy1d_u_
-#elif defined(LINUX) || defined(__crayx1) || defined(HPUX64) || defined(CRAY) || defined(WIN32)
+#elif defined(LINUX) || defined(__crayx1) || defined(CRAY) || defined(WIN32)
 #    define DCOPY2D c_dcopy2d_n_
 #    define DCOPY1D c_dcopy1d_n_
 #else

diff --git a/armci/src/include/semaphores.h b/armci/src/include/semaphores.h
@@ -29,12 +29,6 @@ union semun {
 #   endif
 #endif
 
-/* on HPUX 10.2 SEMMSL is much bigger than realistically we can allocate */  
-#ifdef HPUX
-#undef SEMMSL
-#define SEMMSL 64
-#endif
-
 extern struct sembuf sops;
 extern int semaphoreID;
 int semop();

diff --git a/armci/src/include/spinlock.h b/armci/src/include/spinlock.h
@@ -54,16 +54,6 @@ static int testandset(void *spinlock) {
 }
 #   define TESTANDSET testandset
 
-#elif defined(HPUX) && defined(__ia64) /* HPUX on IA64, non gcc */
-#   if DEBUG_SPINLOCK
-#       warning SPINLOCK: HPUX ia64
-#   endif
-#   define SPINLOCK
-typedef unsigned int slock_t;
-#   include <ia64/sys/inline.h>
-#   define TESTANDSET(lock) _Asm_xchg(_SZ_W, lock, 1, _LDHINT_NONE)
-#   define RELEASE_SPINLOCK(lock) (*((volatile LOCK_T *) (lock)) = 0)
-
 #elif defined(__ia64)
 #   if DEBUG_SPINLOCK
 #       warning SPINLOCK: ia64
@@ -100,16 +90,6 @@ static int testandset(void *spinlock) {
 
 #elif defined(MACX)
 
-#elif defined(HPUX__)
-#   if DEBUG_SPINLOCK
-#       warning SPINLOCK: HPUX__
-#   endif
-extern int _acquire_lock();
-extern void _release_lock();
-#   define SPINLOCK  
-#   define TESTANDSET(x) (!_acquire_lock((x))) 
-#   define RELEASE_SPINLOCK _release_lock 
-
 #elif defined(NEC)
 #   if DEBUG_SPINLOCK
 #       warning SPINLOCK: NEC

diff --git a/armci/src/memory/shmem.c b/armci/src/memory/shmem.c
@@ -115,9 +115,6 @@
 #elif defined(KSR)
 #  undef _SHMMAX
 #  define _SHMMAX ((unsigned long)512*1024)
-#elif defined(HPUX)
-#  undef _SHMMAX
-#  define _SHMMAX ((unsigned long)64*1024)
 #elif defined(__FreeBSD__)
 #  undef _SHMMAX
 #  define _SHMMAX ((unsigned long)3*1024)
@@ -968,7 +965,7 @@ char *pref_addr = (char*)0;
          printf("%d:allocate:attach:id=%d paddr=%p size=%ld\n",armci_me,id,temp,size);
          fflush(stdout);
        }
-#if !defined(AIX) && !defined(HPUX64)
+#if !defined(AIX)
        /* delete segment id so that OS cleans it when all attached processes are gone */
        if(shmctl( id, IPC_RMID, (struct shmid_ds *)NULL))
           fprintf(stderr,"failed to remove shm id=%d\n",id);

diff --git a/armci/src/memory/shmlimit.c b/armci/src/memory/shmlimit.c
@@ -37,7 +37,7 @@
 
 #define DEBUG_ 0
 
-#if defined(SOLARIS64) || defined(HPUX)
+#if defined(SOLARIS64)
 #define PIPE_AFTER_FORK_BUG
 #endif
 

diff --git a/global/testing/util.c b/global/testing/util.c
@@ -453,9 +453,7 @@ double FATR util_timer_()
 void FATR set_ma_use_armci_mem_() 
 {
     int retval;
-#if defined(HPUX64)
-    if((retval=putenv("MA_USE_ARMCI_MEM=YES")) != 0)
-#elif defined(_WIN32)
+#if defined(_WIN32)
     if((retval=_putenv("MA_USE_ARMCI_MEM=YES")) != 0)
 #else
     if((retval=setenv("MA_USE_ARMCI_MEM", "YES", 1)) != 0)

diff --git a/m4/armci_c_opt.m4 b/m4/armci_c_opt.m4
@@ -17,9 +17,6 @@ AS_CASE([$ga_cv_target:$ga_cv_c_compiler_vendor:$host_cpu:$ga_armci_network],
 [CYGWIN:*:*:*],             [armci_cv_c_opt="-malign-double"],
 [FUJITSU_VPP64:*:*:*],      [armci_cv_c_opt="-x100"],
 [FUJITSU_VPP:*:*:*],        [armci_cv_c_opt="-x100 -KA32"],
-[HPUX64:*:*:*],             [armci_cv_c_opt="-Ae"],
-[HPUX64:*:ia64:*],          [armci_cv_c_opt="-Ae"],
-[HPUX:*:*:*],               [armci_cv_c_opt="-Ae"],
 [IBM64:*:*:*],              [armci_cv_c_opt="-O3 -qinline=100 -qstrict -qarch=auto -qtune=auto"],
 [IBM:*:*:*],                [armci_cv_c_opt="-O3 -qinline=100 -qstrict -qarch=auto -qtune=auto"],
 [LINUX64:fujitsu:ia64:*],   [armci_cv_c_opt="-Kfast"],

diff --git a/m4/armci_f77_opt.m4 b/m4/armci_f77_opt.m4
@@ -17,9 +17,6 @@ AS_CASE([$ga_cv_target:$ga_cv_f77_compiler_vendor:$host_cpu:$ga_armci_network],
 [CYGWIN:*:*:*],                 [armci_cv_f77_opt=],
 [FUJITSU_VPP64:*:*:*],          [armci_cv_f77_opt="-Sw"],
 [FUJITSU_VPP:*:*:*],            [armci_cv_f77_opt="-Sw -KA32"],
-[HPUX64:*:*:*],                 [armci_cv_f77_opt="-O3 +Odataprefetch +Ofastaccess"],
-[HPUX64:*:ia64:*],              [armci_cv_f77_opt=],
-[HPUX:*:*:*],                   [armci_cv_f77_opt="-O3 +Odataprefetch"],
 [IBM64:*:*:*],                  [armci_cv_f77_opt=],
 [IBM:*:*:*],                    [armci_cv_f77_opt="-O4 -qarch=auto -qstrict"],
 [LINUX64:fujitsu:ia64:OPENIB],  [armci_cv_f77_opt="-Kfast -X9 -Am -fw -Kthreadsafe"],

diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
@@ -160,14 +160,6 @@ case $host_os in
         ax_pthread_flags="-kthread lthread $ax_pthread_flags"
         ;;
 
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
         openedition*)
 
         # IBM z/OS requires a feature-test macro to be defined in order to
@@ -208,7 +200,7 @@ AS_IF([test "x$GCC" = "xyes"],
 # correctly enabled
 
 case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
+        darwin* | linux* | osf* | solaris*)
         ax_pthread_check_macro="_REENTRANT"
         ;;
 

diff --git a/m4/ga_64bit_flag.m4 b/m4/ga_64bit_flag.m4
@@ -7,8 +7,6 @@
 # Known flags:
 #  -m64     GNU
 #  -q64     IBM
-#  +DD64    HPUX
-#  +DA2.0W  HPUX (obsolete form of +DD64)
 #
 AC_DEFUN([GA_64BIT_FLAG],
 [AC_CACHE_CHECK([for flag to indicate 64-bits], [ga_cv_64bit_flag],

diff --git a/m4/ga_c_opt.m4 b/m4/ga_c_opt.m4
@@ -16,9 +16,6 @@ AS_CASE([$ga_cv_target:$ga_cv_c_compiler_vendor:$host_cpu],
 [CYGWIN:*:*],               [ga_cv_c_opt=],
 [FUJITSU_VPP64:*:*],        [ga_cv_c_opt=],
 [FUJITSU_VPP:*:*],          [ga_cv_c_opt="-KA32"],
-[HPUX64:*:*],               [ga_cv_c_opt="-Ae"],
-[HPUX64:*:ia64],            [ga_cv_c_opt="-Ae"],
-[HPUX:*:*],                 [ga_cv_c_opt="-Ae"],
 [IBM64:*:*],                [ga_cv_c_opt=],
 [IBM:*:*],                  [ga_cv_c_opt=],
 [LINUX64:fujitsu:ia64],     [ga_cv_c_opt="-Kfast"],

diff --git a/m4/ga_f77_opt.m4 b/m4/ga_f77_opt.m4
@@ -16,9 +16,6 @@ AS_CASE([$ga_cv_target:$ga_cv_f77_compiler_vendor:$host_cpu],
 [CYGWIN:*:*],               [ga_cv_f77_opt=],
 [FUJITSU_VPP64:*:*],        [ga_cv_f77_opt="-Sw"],
 [FUJITSU_VPP:*:*],          [ga_cv_f77_opt="-Sw -KA32"],
-[HPUX64:*:*],               [ga_cv_f77_opt="-O1"],    
-[HPUX64:*:ia64],            [ga_cv_f77_opt="-O1"],    
-[HPUX:*:*],                 [ga_cv_f77_opt="-O1"],
 [IBM64:*:*],                [ga_cv_f77_opt="-qarch=auto"],
 [IBM:*:*],                  [ga_cv_f77_opt="-qarch=auto"],
 [LINUX64:*:alpha],          [ga_cv_f77_opt="-align_dcommons -fpe3 -check nooverflow -assume accuracy_sensitive -check nopower -check nounderflow"],

diff --git a/m4/ga_f77_underscore.m4 b/m4/ga_f77_underscore.m4
@@ -10,7 +10,6 @@
 #  -funderscoring         GNU
 #  -fno-second-underscore GNU
 #  -f                     absoft compiler (OSX?)
-#  +ppu                   HPUX some compiler?
 #
 AC_DEFUN([GA_F77_UNDERSCORE],
 [AC_CACHE_CHECK([for $F77 flag to add single underscore to external names],

diff --git a/m4/ga_pario.m4 b/m4/ga_pario.m4
@@ -50,14 +50,6 @@ if test x$LARGE_FILES != x ; then
     PARIO_CPPFLAGS="$PARIO_CPPFLAGS -D_LARGEFILE64_SOURCE"
     PARIO_CFLAGS=`getconf LFS_CFLAGS`
   fi
-  if test x$TARGET = xHPUX ; then
-    PARIO_CPPFLAGS="$PARIO_CPPFLAGS -D_LARGEFILE64_SOURCE"
-    PARIO_CFLAGS=`getconf XBS5_ILP32_OFFBIG_CFLAGS`
-  fi
-  if test x$TARGET = xHPUX64 ; then
-    PARIO_CPPFLAGS="$PARIO_CPPFLAGS -D_LARGEFILE64_SOURCE"
-    PARIO_CFLAGS=`getconf XBS5_LP64_OFF64_CFLAGS`
-  fi
   PARIO_CPPFLAGS="$PARIO_CPPFLAGS -DLARGE_FILES"
 fi
 if test x$USE_LINUXAIO != x ; then

diff --git a/m4/ga_target.m4 b/m4/ga_target.m4
@@ -21,8 +21,6 @@ AH_TEMPLATE([CYGNUS],       [Define to 1 on Cygnus systems])
 AH_TEMPLATE([CYGWIN],       [Define to 1 on Cygwin systems])
 AH_TEMPLATE([FUJITSU_VPP],  [Define to 1 on fujitsu systems])
 AH_TEMPLATE([FUJITSU_VPP64],[Define to 1 on fujitsu systems])
-AH_TEMPLATE([HPUX],         [Define to 1 on HP-UX systems])
-AH_TEMPLATE([HPUX64],       [Define to 1 on 64bit HP-UX systems])
 AH_TEMPLATE([IBM],          [Define to 1 on IBM SP systems])
 AH_TEMPLATE([IBM64],        [Define to 1 on 64bit IBM SP systems])
 AH_TEMPLATE([INTERIX],      [Define to 1 on ??? systems])
@@ -45,7 +43,6 @@ AS_IF([test "x$ga_cv_target_base" = xUNKNOWN],
         #[TODO],            [ga_cv_target_base=CRAY_XT],
         [*cygwin*],         [ga_cv_target_base=CYGWIN],
         [*fujitsu*],        [ga_cv_target_base=FUJITSU_VPP],
-        [*hpux*],           [ga_cv_target_base=HPUX],
         [*ibm*],            [ga_cv_target_base=IBM],
         [*linux*],          [ga_cv_target_base=LINUX],
         [*darwin*],         [ga_cv_target_base=MACX],
@@ -62,7 +59,7 @@ dnl AS_IF([test "x$ARMCI_TOP_BUILDDIR" != x], [
     AC_CACHE_CHECK([whether we think this system is what we call SYSV],
     [ga_cv_sysv],
     [AS_CASE([$ga_cv_target_base],
-        [SUN|SOLARIS|HPUX|IBM|LINUX|INTERIX|NEC],
+        [SUN|SOLARIS|IBM|LINUX|INTERIX|NEC],
             [ga_cv_sysv=yes],
         [ga_cv_sysv=no])
     ])
@@ -80,7 +77,6 @@ AM_CONDITIONAL([CRAY_YMP],     [test "$ga_cv_target_base" = CRAY_YMP])
 AM_CONDITIONAL([CYGNUS],       [test "$ga_cv_target_base" = CYGNUS])
 AM_CONDITIONAL([CYGWIN],       [test "$ga_cv_target_base" = CYGWIN])
 AM_CONDITIONAL([FUJITSU_VPP],  [test "$ga_cv_target_base" = FUJITSU_VPP])
-AM_CONDITIONAL([HPUX],         [test "$ga_cv_target_base" = HPUX])
 AM_CONDITIONAL([IBM],          [test "$ga_cv_target_base" = IBM])
 AM_CONDITIONAL([INTERIX],      [test "$ga_cv_target_base" = INTERIX])
 AM_CONDITIONAL([LINUX],        [test "$ga_cv_target_base" = LINUX])

diff --git a/pario/makefile.h b/pario/makefile.h
@@ -51,19 +51,6 @@ ifdef LARGE_FILES
       LIB_DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
   endif
 
-#
-# HP targets tested on HPUX 11.0
-#
-  ifeq ($(TARGET), HPUX)
-    LIB_DEFINES += -D_LARGEFILE64_SOURCE 
-    LIB_DEFINES += $(shell getconf XBS5_ILP32_OFFBIG_CFLAGS)
-  endif  
-
-  ifeq ($(TARGET), HPUX64)
-    LIB_DEFINES +=  -D_LARGEFILE64_SOURCE 
-    LIB_DEFINES += $(shell getconf XBS5_LP64_OFF64_CFLAGS)
-  endif  
-
   LIB_DEFINES += -DLARGE_FILES
 endif
 

diff --git a/tcgmsg/examples/Makefile.proto b/tcgmsg/examples/Makefile.proto
@@ -34,22 +34,6 @@ IF APOLLO
       LIBS =
    SCFBLAS = scfblas.o
 ENDIF
-IF HPUX
-        FC = f77
-        CC = cc
-      LIBS =
-    FFLAGS = -O +ppu
-    CFLAGS = -O -DHPUX -DEXTNAME -DPLOT -I$(LIBDIR)
-   SCFBLAS = scfblas.o
-ENDIF HPUX
-IF HPUXNOEXT
-        FC = f77
-        CC = cc
-      LIBS =
-    FFLAGS = -O
-    CFLAGS = -O -DHPUX -DPLOT -I$(LIBDIR)
-   SCFBLAS = scfblas.o
-ENDIF HPUXNOEXT
 IF SUN
         FC = f77
         CC = cc

diff --git a/tcgmsg/examples/fexit.f.proto b/tcgmsg/examples/fexit.f.proto
@@ -7,7 +7,7 @@ c     explicitly call exit
 ELSE
 ENDIF
       end
-IF HPUX HPUXNOEXT IBM IBMNOEXT
+IF IBM IBMNOEXT
       subroutine flush(iunit)
       end
 ENDIF
diff --git a/tcgmsg/examples/getmem.c b/tcgmsg/examples/getmem.c
@@ -5,7 +5,7 @@
 /*$Id: getmem.c,v 1.2 1995-02-02 23:24:10 d3g681 Exp $*/
 extern char * memalign();
 
-#if (defined(AIX) || defined(NEXT) || defined(HPUX)) && !defined(EXTNAME)
+#if (defined(AIX) || defined(NEXT)) && !defined(EXTNAME)
 #define getmem_ getmem
 #endif
 

diff --git a/tcgmsg/tests/hpuxargs.f b/tcgmsg/tests/hpuxargs.f