COMP: remove wmake rules for discontinued IA64 (itanium) arch

2022-11-07 09:37:50 +01:00 · 2022-11-07 09:37:50 +01:00 · c2af76337e
commit c2af76337e
parent edc12c9ad9
23 changed files with 4 additions and 176 deletions
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -359,9 +359,6 @@ case HPMPI:
    case i686:
        set _foamFoundDir=lib/linux_ia32
        breaksw
-    case ia64:
-        set _foamFoundDir=lib/linux_ia64
-        breaksw
    endsw

    if ( "${_foamFoundDir}" != "" ) then
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -71,10 +71,6 @@ case Linux:
        setenv WM_ARCH linux
        breaksw

-    case ia64:
-        setenv WM_ARCH linuxIA64
-        breaksw
-
    default:
        echo "openfoam: (`uname -m`) - unknown Linux processor type"
        breaksw
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -363,7 +363,6 @@ HPMPI)
    case "$(uname -m)" in
    x86_64) _foamFoundDir=lib/linux_amd64 ;;
    i686)   _foamFoundDir=lib/linux_ia32 ;;
-    ia64)   _foamFoundDir=lib/linux_ia64 ;;
    *)      unset _foamFoundDir ;;
    esac

--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -68,10 +68,6 @@ Linux)
        WM_ARCH=linux
        ;;

-    ia64)
-        WM_ARCH=linuxIA64
-        ;;
-
    *)
        echo "openfoam: ($(uname -m)) - unknown Linux processor type" 1>&2
        ;;
--- a/wmake/rules/General/mplib-ia64-HPMPI
+++ b/wmake/rules/General/mplib-ia64-HPMPI
@ -1,8 +0,0 @@
-#------------------------------------------------------------------------------
-# HPMPI rules (ia64)
-
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@ -18,5 +18,4 @@ cxxtoo      = $(Ctoo)

 include $(GENERAL_RULES)/Icc/link-c++

-#legacy: LINK_LIBS   += -L$(IA64ROOT)/lib
 #------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Gcc/X
+++ b/wmake/rules/linuxIA64Gcc/X
@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
--- a/wmake/rules/linuxIA64Gcc/c
+++ b/wmake/rules/linuxIA64Gcc/c
@ -1,18 +0,0 @@
-#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Gcc/c
-
-cARCH      :=
-
-ifneq (,$(WM_COMPILE_OPTION))
-    sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
-endif
-
-cFLAGS      = \
-    $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) \
-    $(FOAM_EXTRA_CFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
-
-include $(GENERAL_RULES)/Gcc/link-c
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@ -1,24 +0,0 @@
-#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Gcc/c++
-
-c++ARCH    :=
-
-ifneq (,$(WM_COMPILE_OPTION))
-    sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
-endif
-
-c++FLAGS    = \
-    $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \
-    $(FOAM_EXTRA_CXXFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-cxxtoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Gcc/c++Debug
+++ b/wmake/rules/linuxIA64Gcc/c++Debug
@ -1,2 +0,0 @@
-c++DBUG     = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/linuxIA64Gcc/cDebug
+++ b/wmake/rules/linuxIA64Gcc/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/linuxIA64Gcc/general
+++ b/wmake/rules/linuxIA64Gcc/general
@ -1,14 +0,0 @@
-CPP        = cpp -traditional-cpp $(GFLAGS)
-
-include $(GENERAL_RULES)/standard
-include $(GENERAL_RULES)/Gcc/openmp
-
-ifneq (,$(findstring ~openmp,$(WM_COMPILE_CONTROL)))
-    include $(GENERAL_RULES)/no-openmp
-endif
-
-include $(DEFAULT_RULES)/X
-include $(DEFAULT_RULES)/c
-include $(DEFAULT_RULES)/c++
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Gcc/mplibHPMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibHPMPI
@ -1 +0,0 @@
-include $(GENERAL_RULES)/mplib-ia64-HPMPI
--- a/wmake/rules/linuxIA64Gcc/mplibMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DSGIMPI -DMPI_NO_CPPBIND
-PINC       =
-PLIBS      = -lmpi
--- a/wmake/rules/linuxIA64Icc/X
+++ b/wmake/rules/linuxIA64Icc/X
@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
--- a/wmake/rules/linuxIA64Icc/c
+++ b/wmake/rules/linuxIA64Icc/c
@ -1,21 +0,0 @@
-#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Icc/c
-
-cARCH      :=
-
-ifneq (,$(WM_COMPILE_OPTION))
-    sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
-endif
-
-cFLAGS      = \
-    $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) \
-    $(FOAM_EXTRA_CFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
-
-LINK_LIBS   = $(cDBUG) -L$(IA32ROOT)/lib
-
-LINKLIBSO   = $(cc) $(cARCH) -i_dynamic
-LINKEXE     = $(cc) $(cARCH) -Xlinker -z -Xlinker nodefs
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Icc/c++
+++ b/wmake/rules/linuxIA64Icc/c++
@ -1,24 +0,0 @@
-#------------------------------------------------------------------------------
-include $(GENERAL_RULES)/Icc/c++
-
-c++ARCH    :=
-
-ifneq (,$(WM_COMPILE_OPTION))
-    sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
-endif
-
-c++FLAGS    = \
-    $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \
-    $(FOAM_EXTRA_CXXFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-cxxtoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG) -L$(IA32ROOT)/lib
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS)
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Icc/c++Opt
+++ b/wmake/rules/linuxIA64Icc/c++Opt
@ -1,12 +0,0 @@
-c++DBUG     =
-c++OPT      = \
-    -DICC_IA64_PREFETCH \
-    -ansi-alias \
-    -O3 \
-    -fp-speculationsafe \
-    -ftz \
-    -mP3OPT_ecg_swp_control=0x400000 \
-    -fno-alias \
-    -mtune=itanium2 \
-    -fargument-noalias-global \
-    -unroll0
--- a/wmake/rules/linuxIA64Icc/c++Prof
+++ b/wmake/rules/linuxIA64Icc/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -prof_gen
-c++OPT     = -O3
--- a/wmake/rules/linuxIA64Icc/general
+++ b/wmake/rules/linuxIA64Icc/general
@ -1,15 +0,0 @@
-CPP        = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH
-GLIBS      =
-
-include $(GENERAL_RULES)/standard
-include $(GENERAL_RULES)/Icc/openmp
-
-ifneq (,$(findstring ~openmp,$(WM_COMPILE_CONTROL)))
-    include $(GENERAL_RULES)/no-openmp
-endif
-
-include $(DEFAULT_RULES)/X
-include $(DEFAULT_RULES)/c
-include $(DEFAULT_RULES)/c++
-
-#------------------------------------------------------------------------------
--- a/wmake/rules/linuxIA64Icc/mplibHPMPI
+++ b/wmake/rules/linuxIA64Icc/mplibHPMPI
@ -1 +0,0 @@
-include $(GENERAL_RULES)/mplib-ia64-HPMPI
--- a/wmake/rules/linuxIA64Icc/mplibIMPI
+++ b/wmake/rules/linuxIA64Icc/mplibIMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DSGIMPI -DMPI_NO_CPPBIND
-PINC       =
-PLIBS      = -lmpi
--- a/wmake/rules/linuxIA64Icc/mplibMPI
+++ b/wmake/rules/linuxIA64Icc/mplibMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DSGIMPI -DMPI_NO_CPPBIND
-PINC       =
-PLIBS      = -lmpi