diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C index 7d401bf8af..b3c39d7261 100644 --- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C +++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.C @@ -28,7 +28,7 @@ Description #include "writeFuns.H" -#ifdef __mips +#if defined(__mips) && !defined(__SICORTEX__) #include #include #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C index b4dcb52045..3b4ce6c0ff 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C @@ -27,7 +27,7 @@ License #include "writeFuns.H" #include "vtkTopo.H" -#ifdef __mips +#if defined(__mips) && !defined(__SICORTEX__) #include #include #endif diff --git a/etc/bashrc b/etc/bashrc index 35044f5b01..dbd93896ec 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -142,6 +142,16 @@ Linux) WM_ARCH=linuxIA64 export WM_COMPILER=I64 ;; + mips64) + WM_ARCH=SiCortex64 + export WM_COMPILER_LIB_ARCH=64 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-mabi=64 -fPIC' + export WM_CXXFLAGS='-mabi=64 -fPIC' + export WM_LDFLAGS='-mabi=64 -G0' + export WM_MPLIB=MPI + ;; *) echo Unknown processor type `uname -m` for Linux ;; diff --git a/etc/cshrc b/etc/cshrc index 0b953b9bff..1f628dec84 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -139,6 +139,16 @@ case Linux: setenv WM_ARCH linuxIA64 setenv WM_COMPILER I64 breaksw + mips64) + setenv WM_ARCH SiCortex64 + setenv WM_COMPILER_LIB_ARCH 64 + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-mabi=64 -fPIC' + setenv WM_CXXFLAGS '-mabi=64 -fPIC' + setenv WM_LDFLAGS '-mabi=64 -G0' + setenv WM_MPLIB MPI + ;; default: echo Unknown processor type `uname -m` for Linux breaksw diff --git a/wmake/rules/SiCortex64Gcc/X b/wmake/rules/SiCortex64Gcc/X new file mode 100644 index 0000000000..5d1f9c5cc5 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/X @@ -0,0 +1,3 @@ +XFLAGS = +XINC = $(XFLAGS) -I/usr/X11R6/include +XLIBS = -L/usr/X11R6/lib64 -lXext -lX11 diff --git a/wmake/rules/SiCortex64Gcc/c b/wmake/rules/SiCortex64Gcc/c new file mode 100644 index 0000000000..21a13e04b8 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/c @@ -0,0 +1,17 @@ +.SUFFIXES: .c .h + +cWARN = -Wall + +cc = gcc -mabi=64 +#cc = scgcc -mabi=64 + +include $(RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = -G0 $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++ new file mode 100644 index 0000000000..f0a8cf5041 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/c++ @@ -0,0 +1,22 @@ +.SUFFIXES: .C .cxx .cc .cpp + +c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast + +CC = g++ -mabi=64 +#CC = scg++ -mabi=64 + +include $(RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-40 + +c++FLAGS = -G0 $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) diff --git a/wmake/rules/SiCortex64Gcc/c++Debug b/wmake/rules/SiCortex64Gcc/c++Debug new file mode 100644 index 0000000000..19bdb9c334 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -ggdb3 -DFULLDEBUG +c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/SiCortex64Gcc/c++Opt b/wmake/rules/SiCortex64Gcc/c++Opt new file mode 100644 index 0000000000..636689e917 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/c++Opt @@ -0,0 +1,4 @@ +c++DBUG = +c++OPT = -O3 +#c++OPT = -O3 +# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/SiCortex64Gcc/c++Prof b/wmake/rules/SiCortex64Gcc/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/SiCortex64Gcc/cDebug b/wmake/rules/SiCortex64Gcc/cDebug new file mode 100644 index 0000000000..72b638f458 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/cDebug @@ -0,0 +1,2 @@ +cDBUG = -ggdb -DFULLDEBUG +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/SiCortex64Gcc/cOpt b/wmake/rules/SiCortex64Gcc/cOpt new file mode 100644 index 0000000000..aaaebef3d3 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 -fno-gcse diff --git a/wmake/rules/SiCortex64Gcc/cProf b/wmake/rules/SiCortex64Gcc/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++ new file mode 100644 index 0000000000..d745628aab --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/flex++ @@ -0,0 +1,6 @@ +.SUFFIXES: .L + +Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ + +.L.dep: + $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general new file mode 100644 index 0000000000..11b48acc3f --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/general @@ -0,0 +1,11 @@ +CPP = /lib/cpp $(GFLAGS) +LD = ld -A64 + +PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl + +include $(GENERAL_RULES)/standard + +include $(RULES)/X +include $(RULES)/c +include $(RULES)/c++ +include $(GENERAL_RULES)/cint diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib new file mode 100644 index 0000000000..8a84b40146 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/mplib @@ -0,0 +1,3 @@ +PFLAGS = +PINC = +PLIBS = diff --git a/wmake/rules/SiCortex64Gcc/mplibMPI b/wmake/rules/SiCortex64Gcc/mplibMPI new file mode 100644 index 0000000000..4b284e2439 --- /dev/null +++ b/wmake/rules/SiCortex64Gcc/mplibMPI @@ -0,0 +1,3 @@ +PFLAGS = -DMPICH_SKIP_MPICXX +PINC = +PLIBS = -lscmpi