diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b4e538c882deaf3c4d7f5dc00a587fde2f249af..d01bfac63c29f85f8266a4ada8966d36787d8a29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,15 +212,6 @@ else() endif() mark_as_advanced ( WALBERLA_CXX_COMPILER_IS_IBM ) -# Check for NEC SX compiler -if( CMAKE_CXX_COMPILER MATCHES "/sxc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "/sxc" OR CMAKE_CXX_COMPILER MATCHES "/sxmpic" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "/sxmpic" ) - option ( WALBERLA_CXX_COMPILER_IS_NEC "Use NEC compiler" ON ) - include(NEC) -else() - option ( WALBERLA_CXX_COMPILER_IS_NEC "Use NEC compiler" OFF ) -endif() -mark_as_advanced ( WALBERLA_CXX_COMPILER_IS_NEC ) - if( CMAKE_CXX_COMPILER MATCHES "clang" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "clang" OR CMAKE_CXX_COMPILER MATCHES "hipcc" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" ) option ( WALBERLA_CXX_COMPILER_IS_CLANG "Use clang compiler" ON ) include(Clang) diff --git a/cmake/compileroptions/NEC.cmake b/cmake/compileroptions/NEC.cmake deleted file mode 100644 index 0fff82a93c0849459199f30c9975a91d3c46bd1e..0000000000000000000000000000000000000000 --- a/cmake/compileroptions/NEC.cmake +++ /dev/null @@ -1,81 +0,0 @@ -message(STATUS "Setting NEC specific compiler options") - -# C++ language features for NEC compiler -set(CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION - "-Kcpp${CMAKE_CXX_STANDARD}") -set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES - CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION) -add_flag( - CMAKE_CXX_FLAGS - "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION} -Krtti -Kexceptions -size_t64 -Kgcc" -) -add_flag(CMAKE_CXX_FLAGS "-D__BIG_ENDIAN -D__BYTE_ORDER=__BIG_ENDIAN") -add_flag(CMAKE_CXX_FLAGS "-Tnoauto,used") -add_flag(CMAKE_EXE_LINKER_FLAGS "-Wl,-h,muldefs") -add_flag(CMAKE_C_FLAGS "-size_t64 -Kgcc") -add_flag(CMAKE_C_FLAGS "-D__BIG_ENDIAN -D__BYTE_ORDER=__BIG_ENDIAN") -add_flag(CMAKE_C_FLAGS "-DSQLITE_OMIT_WAL -DHAVE_UTIME -DTHREADSAFE=0") -set(CMAKE_RANLIB /bin/true) -set(CMAKE_SKIP_BUILD_RPATH TRUE) -set(CMAKE_C_FLAGS_DEBUGOPTIMIZED "-Chopt -g") -set(CMAKE_C_FLAGS_DEBUG "-Cdebug -g") -set(CMAKE_CXX_FLAGS_DEBUGOPTIMIZED "-Chopt -g") -set(CMAKE_CXX_FLAGS_DEBUG "-Cdebug -g") - -add_flag(CMAKE_CXX_FLAGS "-wall") - -# ############################################################################## -# -# Fix compiler bugs -# -# ############################################################################## - -# The NEC SX has a few issues in its standard library headers -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/math.h - "#include_next <math.h>\n#undef fpclassify\n#undef signbit\n#undef isfinite\n#undef isinf\n#undef isnan\n#undef isnormal\n#undef isgreater\n#undef isgreaterequal\n#undef isless\n#undef islessequal\n#undef islessgreater\n#undef isunordered\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/types.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/types.h\" \n#undef uint_t\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/acl.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/acl.h\" \n#undef uint_t\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/if_ehcpl.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/if_ehcpl.h\"\n#undef uint_t\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/ptms.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/ptms.h\" \n#undef uint_t\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/stream.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/stream.h\" \n#undef uint_t\n" -) -file( - WRITE ${walberla_BINARY_DIR}/CMakeFiles/src/sys/strsubr.h - "#define uint_t SX_UINT_T\n#include \"/SX/usr/include/sys/strsubr.h\" \n#undef uint_t\n" -) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/math.h - ${walberla_BINARY_DIR}/src/math.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/types.h - ${walberla_BINARY_DIR}/src/sys/types.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/acl.h - ${walberla_BINARY_DIR}/src/sys/acl.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/if_ehcpl.h - ${walberla_BINARY_DIR}/src/sys/if_ehcpl.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/ptms.h - ${walberla_BINARY_DIR}/src/sys/ptms.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/stream.h - ${walberla_BINARY_DIR}/src/sys/stream.h COPYONLY) -configure_file(${walberla_BINARY_DIR}/CMakeFiles/src/sys/strsubr.h - ${walberla_BINARY_DIR}/src/sys/strsubr.h COPYONLY) - -if(WALBERLA_BUILD_WITH_OPENMP) - message(STATUS "Enabling OpenMP workaround for NEC") - add_flag(CMAKE_C_FLAGS "-Popenmp") - add_flag(CMAKE_CXX_FLAGS "-Popenmp") -endif()