diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi index 37f4207b8d..8ab7f866ac 100644 --- a/etc/config.csh/mpi +++ b/etc/config.csh/mpi @@ -164,9 +164,6 @@ case HPMPI: case x86_64: _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64 breaksw - case ia64: - _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64 - breaksw default: echo Unknown processor type `uname -m` for Linux breaksw diff --git a/etc/config.csh/settings b/etc/config.csh/settings index 6da102d68c..143195b91c 100644 --- a/etc/config.csh/settings +++ b/etc/config.csh/settings @@ -81,11 +81,6 @@ case Linux: endsw breaksw - case ia64: - setenv WM_ARCH linuxIA64 - setenv WM_COMPILER I64 - breaksw - case ppc64: setenv WM_ARCH linuxPPC64 setenv WM_COMPILER_LIB_ARCH 64 diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi index 9688cb1dd7..8752c0026a 100644 --- a/etc/config.sh/mpi +++ b/etc/config.sh/mpi @@ -172,9 +172,6 @@ HPMPI) x86_64) _foamAddLib $MPI_ARCH_PATH/lib/linux_amd64 ;; - ia64) - _foamAddLib $MPI_ARCH_PATH/lib/linux_ia64 - ;; *) echo Unknown processor type `uname -m` 1>&2 ;; diff --git a/etc/config.sh/settings b/etc/config.sh/settings index 17558f385d..a49b6c4507 100644 --- a/etc/config.sh/settings +++ b/etc/config.sh/settings @@ -74,11 +74,6 @@ Linux) esac ;; - ia64) - WM_ARCH=linuxIA64 - export WM_COMPILER=I64 - ;; - armv7l) WM_ARCH=linuxARM7 export WM_ARCH_OPTION=32 diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C index 7609c6fac5..9b2ccb2deb 100644 --- a/src/OSspecific/POSIX/signals/sigFpe.C +++ b/src/OSspecific/POSIX/signals/sigFpe.C @@ -35,8 +35,6 @@ License #endif #include #include -#elif defined(sgiN32) || defined(sgiN32Gcc) - #include #endif #include @@ -182,32 +180,8 @@ void Foam::sigFpe::set(const bool verbose) << "Cannot set SIGFPE trapping" << abort(FatalError); } - - - #elif defined(sgiN32) || defined(sgiN32Gcc) - supported = true; - - sigfpe_[_DIVZERO].abort=1; - sigfpe_[_OVERFL].abort=1; - sigfpe_[_INVALID].abort=1; - - sigfpe_[_DIVZERO].trace=1; - sigfpe_[_OVERFL].trace=1; - sigfpe_[_INVALID].trace=1; - - handle_sigfpes - ( - _ON, - _EN_DIVZERO - | _EN_INVALID - | _EN_OVERFL, - 0, - _ABORT_ON_ERROR, - nullptr - ); #endif - if (verbose) { if (supported) diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H index f3f00a548f..ee6951b9e7 100644 --- a/src/OSspecific/POSIX/signals/sigFpe.H +++ b/src/OSspecific/POSIX/signals/sigFpe.H @@ -45,7 +45,7 @@ SourceFiles #include -#if defined(linux) || defined(linux64) || defined(linuxIA64) || \ +#if defined(linux) || defined(linux64) || \ defined(linuxARM7) || defined(linuxPPC64) || defined(linuxPPC64le) #define LINUX #endif diff --git a/wmake/rules/linuxIA64Gcc/X b/wmake/rules/linuxIA64Gcc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxIA64Gcc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxIA64Gcc/c b/wmake/rules/linuxIA64Gcc/c deleted file mode 100644 index 91d6fda4de..0000000000 --- a/wmake/rules/linuxIA64Gcc/c +++ /dev/null @@ -1,16 +0,0 @@ -SUFFIXES += .c - -cWARN = -Wall - -cc = gcc - -include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ - -LINK_LIBS = $(cDBUG) - -LINKLIBSO = $(cc) -fuse-ld=bfd -shared -LINKEXE = $(cc) -fuse-ld=bfd -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++ deleted file mode 100644 index 13e8a72328..0000000000 --- a/wmake/rules/linuxIA64Gcc/c++ +++ /dev/null @@ -1,25 +0,0 @@ -SUFFIXES += .C - -c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \ - -Wno-invalid-offsetof -Wno-attributes - -# Suppress some warnings for flex++ and CGAL -c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds - -CC = g++ -std=c++11 - -include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository -ftemplate-depth-100 - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) - -LINKLIBSO = $(CC) $(c++FLAGS) -fuse-ld=bfd -shared -LINKEXE = $(CC) $(c++FLAGS) -fuse-ld=bfd -Xlinker --add-needed diff --git a/wmake/rules/linuxIA64Gcc/c++Debug b/wmake/rules/linuxIA64Gcc/c++Debug deleted file mode 100644 index 19bdb9c334..0000000000 --- a/wmake/rules/linuxIA64Gcc/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxIA64Gcc/c++Opt b/wmake/rules/linuxIA64Gcc/c++Opt deleted file mode 100644 index 2aedabd628..0000000000 --- a/wmake/rules/linuxIA64Gcc/c++Opt +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -c++OPT = -O3 diff --git a/wmake/rules/linuxIA64Gcc/c++Prof b/wmake/rules/linuxIA64Gcc/c++Prof deleted file mode 100644 index 3bda4dad55..0000000000 --- a/wmake/rules/linuxIA64Gcc/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/linuxIA64Gcc/cDebug b/wmake/rules/linuxIA64Gcc/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linuxIA64Gcc/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxIA64Gcc/cOpt b/wmake/rules/linuxIA64Gcc/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxIA64Gcc/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxIA64Gcc/cProf b/wmake/rules/linuxIA64Gcc/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxIA64Gcc/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general deleted file mode 100644 index 182ee7f901..0000000000 --- a/wmake/rules/linuxIA64Gcc/general +++ /dev/null @@ -1,9 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) - -PROJECT_LIBS = -l$(WM_PROJECT) -ldl - -include $(GENERAL_RULES)/standard - -include $(DEFAULT_RULES)/X -include $(DEFAULT_RULES)/c -include $(DEFAULT_RULES)/c++ diff --git a/wmake/rules/linuxIA64Gcc/mplibHPMPI b/wmake/rules/linuxIA64Gcc/mplibHPMPI deleted file mode 100644 index cd11010d24..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi diff --git a/wmake/rules/linuxIA64Gcc/mplibMPI b/wmake/rules/linuxIA64Gcc/mplibMPI deleted file mode 100644 index 186769c0c2..0000000000 --- a/wmake/rules/linuxIA64Gcc/mplibMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND -PINC = -PLIBS = -lmpi diff --git a/wmake/rules/linuxIA64Icc/X b/wmake/rules/linuxIA64Icc/X deleted file mode 100644 index bed8bfeddf..0000000000 --- a/wmake/rules/linuxIA64Icc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c deleted file mode 100644 index 2b19596b1a..0000000000 --- a/wmake/rules/linuxIA64Icc/c +++ /dev/null @@ -1,16 +0,0 @@ -SUFFIXES += .c - -cWARN = - -cc = icc - -include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) - -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ - -LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib - -LINKLIBSO = $(cc) -i_dynamic -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++ deleted file mode 100644 index 70c00d3ead..0000000000 --- a/wmake/rules/linuxIA64Icc/c++ +++ /dev/null @@ -1,25 +0,0 @@ -SUFFIXES += .C - -c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \ - -diag-disable 2304,1292 - -# Suppress some warnings for flex++ and CGAL -c++LESSWARN = -diag-disable 1224,2026,2305 - -CC = icpc -std=c++11 - -include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) - -ptFLAGS = -DNoRepository - -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ -cxxtoo = $(Ctoo) -cctoo = $(Ctoo) -cpptoo = $(Ctoo) - -LINK_LIBS = $(c++DBUG) -L$(IA32ROOT)/lib - -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/linuxIA64Icc/c++Debug b/wmake/rules/linuxIA64Icc/c++Debug deleted file mode 100644 index 0aec1fbffe..0000000000 --- a/wmake/rules/linuxIA64Icc/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -g -DFULLDEBUG -O0 -c++OPT = diff --git a/wmake/rules/linuxIA64Icc/c++Opt b/wmake/rules/linuxIA64Icc/c++Opt deleted file mode 100644 index dd3d557474..0000000000 --- a/wmake/rules/linuxIA64Icc/c++Opt +++ /dev/null @@ -1,13 +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 diff --git a/wmake/rules/linuxIA64Icc/c++Prof b/wmake/rules/linuxIA64Icc/c++Prof deleted file mode 100644 index 9295c12648..0000000000 --- a/wmake/rules/linuxIA64Icc/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -prof_gen -c++OPT = -O3 diff --git a/wmake/rules/linuxIA64Icc/cDebug b/wmake/rules/linuxIA64Icc/cDebug deleted file mode 100644 index 73dce0dfd0..0000000000 --- a/wmake/rules/linuxIA64Icc/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -g -DFULLDEBUG -O0 -cOPT = diff --git a/wmake/rules/linuxIA64Icc/cOpt b/wmake/rules/linuxIA64Icc/cOpt deleted file mode 100644 index 17318709f1..0000000000 --- a/wmake/rules/linuxIA64Icc/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/linuxIA64Icc/cProf b/wmake/rules/linuxIA64Icc/cProf deleted file mode 100644 index ca3ac9bf5f..0000000000 --- a/wmake/rules/linuxIA64Icc/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general deleted file mode 100644 index 09a3896656..0000000000 --- a/wmake/rules/linuxIA64Icc/general +++ /dev/null @@ -1,9 +0,0 @@ -CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH - -GLIBS = - -include $(GENERAL_RULES)/standard - -include $(DEFAULT_RULES)/X -include $(DEFAULT_RULES)/c -include $(DEFAULT_RULES)/c++ diff --git a/wmake/rules/linuxIA64Icc/mplibHPMPI b/wmake/rules/linuxIA64Icc/mplibHPMPI deleted file mode 100644 index cd11010d24..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibHPMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H -PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi diff --git a/wmake/rules/linuxIA64Icc/mplibMPI b/wmake/rules/linuxIA64Icc/mplibMPI deleted file mode 100644 index 186769c0c2..0000000000 --- a/wmake/rules/linuxIA64Icc/mplibMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND -PINC = -PLIBS = -lmpi