X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a97310f9bb922ed0dcd349d9dbc324a957e4dc68..772b9175568d56fc6aa873c5215274cf3ae39b15:/buildtools/Cmake/CompleteInFiles.cmake diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 700502ff57..4179edfbc5 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -3,21 +3,17 @@ ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules ) -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #Intel processor 64 bits - message(STATUS "System processor: amd64") - set(HAVE_RAWCTX 1) - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") #Intel processor 32 bits - message(STATUS "System processor: x86") - set(PROCESSOR_i686 1) - set(HAVE_RAWCTX 1) - -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") +# x86_64 +# x86 +# i.86 +IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") IF(${ARCH_32_BITS}) set(PROCESSOR_i686 1) + set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}") ELSE(${ARCH_32_BITS}) message(STATUS "System processor: amd64") + set(SIMGRID_SYSTEM_PROCESSOR "amd64") set(PROCESSOR_x86_64 1) set(PROCESSOR_i686 0) ENDIF(${ARCH_32_BITS}) @@ -58,7 +54,7 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh") ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}") -ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") @@ -215,14 +211,16 @@ if(pthread) ### Test that we have a way to create semaphores if(HAVE_SEM_OPEN_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -o testprog" + exec_program("${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_open.c -lpthread -o testprog" OUTPUT_VARIABLE HAVE_SEM_OPEN_run) if(HAVE_SEM_OPEN_run) set(HAVE_SEM_OPEN 0) + message(STATUS "Warning: sem_open not compilable") else(HAVE_SEM_OPEN_run) exec_program("./testprog" RETURN_VALUE HAVE_SEM_OPEN_run2 OUTPUT_VARIABLE var_compil) if(HAVE_SEM_OPEN_run2) set(HAVE_SEM_OPEN 0) + message(STATUS "Warning: sem_open not executable") else(HAVE_SEM_OPEN_run2) set(HAVE_SEM_OPEN 1) endif(HAVE_SEM_OPEN_run2) @@ -232,14 +230,16 @@ if(pthread) endif(HAVE_SEM_OPEN_LIB) if(HAVE_SEM_INIT_LIB) - exec_program("${CMAKE_C_COMPILER} -lpthread ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -o testprog" + exec_program("${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o testprog" OUTPUT_VARIABLE HAVE_SEM_INIT_run) if(HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 0) + message(STATUS "Warning: sem_init not compilable") else(HAVE_SEM_INIT_run) exec_program("./testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil) if(HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 0) + message(STATUS "Warning: sem_init not executable") else(HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 1) endif(HAVE_SEM_INIT_run) @@ -249,7 +249,7 @@ if(pthread) endif(HAVE_SEM_INIT_LIB) if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) - message(FATAL_ERROR "Semaphores are not usable, but they are mandatory to threads (you may need to mount /dev).") + message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).") endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT) ### Test that we have a way to timewait for semaphores @@ -386,6 +386,34 @@ else(BIGENDIAN) set(GRAS_BIGENDIAN 0) endif(BIGENDIAN) +# The syntax of this magic string is given in src/gras/DataDesc/ddt_convert.c +# It kinda matches the values that the gras_arch_desc_t structure can take + +# Basically, the syntax is one char l or B for endianness (little or Big) +# then there is a bunch of blocks separated by _. +# C block is for char, I block for integers, P block for pointers and +# D block for floating points +# For each block there is an amount of chuncks separated by :, each of +# them describing a data size. For example there is only one chunk +# in the char block, because no architecture provide several sizes +# of chars. In integer block, there is 4 chunks: "short int", "int", +# "long int", "long long int". There is 2 pointer chunks for data +# pointers and pointers on functions (thanks to the AMD64 madness). +# Thee two floating points chuncks are for "float" and "double". +# Each chunk is of the form datasize/minimal_alignment_size + +# These informations are used to convert a data stream from one +# formalism to another. Only the GRAS_ARCH is transfered in the +# stream, and it it of cruxial importance to keep these detection +# information here synchronized with the data hardcoded in the +# source in src/gras/DataDesc/ddt_convert.c + +# If you add something here (like a previously unknown architecture), +# please add it to the source code too. +# Please do not modify stuff here since it'd break the GRAS protocol. +# If you really need to change stuff, please also bump +# GRAS_PROTOCOL_VERSION in src/gras/Msg/msg_interface.h + SET(GRAS_THISARCH "none") if(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") @@ -413,36 +441,41 @@ if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 4) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") +if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") + #gras_arch=5; gras_size=64; gras_arch_name=little64_2; + SET(GRAS_ARCH_32_BITS 0) + SET(GRAS_THISARCH 5) +endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") - #gras_arch=5; gras_size=32; gras_arch_name=big32; + #gras_arch=6; gras_size=32; gras_arch_name=big32_8; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 5) + SET(GRAS_THISARCH 6) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") - #gras_arch=6; gras_size=32; gras_arch_name=big32_8_4; + #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 6) + SET(GRAS_THISARCH 7) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") - #gras_arch=7; gras_size=32; gras_arch_name=big32_4; + #gras_arch=8; gras_size=32; gras_arch_name=big32_4; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 7) + SET(GRAS_THISARCH 8) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") - #gras_arch=8; gras_size=32; gras_arch_name=big32_2; + #gras_arch=9; gras_size=32; gras_arch_name=big32_2; SET(GRAS_ARCH_32_BITS 1) - SET(GRAS_THISARCH 8) + SET(GRAS_THISARCH 9) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") - #gras_arch=9; gras_size=64; gras_arch_name=big64; + #gras_arch=10; gras_size=64; gras_arch_name=big64; SET(GRAS_ARCH_32_BITS 0) - SET(GRAS_THISARCH 9) + SET(GRAS_THISARCH 10) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") - #gras_arch=10;gras_size=64; gras_arch_name=big64_8_4; + #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4; SET(GRAS_ARCH_32_BITS 0) - SET(GRAS_THISARCH 10) + SET(GRAS_THISARCH 11) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") if(GRAS_THISARCH MATCHES "none")