diff options
Diffstat (limited to 'openmp/runtime/cmake')
| -rw-r--r-- | openmp/runtime/cmake/LibompMicroTests.cmake | 8 | ||||
| -rw-r--r-- | openmp/runtime/cmake/config-ix.cmake | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/openmp/runtime/cmake/LibompMicroTests.cmake b/openmp/runtime/cmake/LibompMicroTests.cmake index 825d231b8f8..76bc5503a11 100644 --- a/openmp/runtime/cmake/LibompMicroTests.cmake +++ b/openmp/runtime/cmake/LibompMicroTests.cmake @@ -150,8 +150,8 @@ add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success) add_custom_command( OUTPUT test-execstack/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-execstack - COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/check-execstack.pl --os=${LIBOMP_PERL_SCRIPT_OS} - --arch=${LIBOMP_ARCH} ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} + COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/check-execstack.pl + --arch=${LIBOMP_PERL_SCRIPT_ARCH} ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} COMMAND ${CMAKE_COMMAND} -E touch test-execstack/.success DEPENDS omp ) @@ -162,7 +162,7 @@ add_custom_command( OUTPUT test-instr/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-instr COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/check-instruction-set.pl --os=${LIBOMP_PERL_SCRIPT_OS} - --arch=${LIBOMP_ARCH} --show --mic-arch=${LIBOMP_MIC_ARCH} ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} + --arch=${LIBOMP_PERL_SCRIPT_ARCH} --show --mic-arch=${LIBOMP_MIC_ARCH} ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} COMMAND ${CMAKE_COMMAND} -E touch test-instr/.success DEPENDS omp ${LIBOMP_TOOLS_DIR}/check-instruction-set.pl ) @@ -219,7 +219,7 @@ add_custom_command( OUTPUT test-deps/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-deps COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/check-depends.pl --os=${LIBOMP_PERL_SCRIPT_OS} - --arch=${LIBOMP_ARCH} --expected="${libomp_expected_library_deps}" ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} + --arch=${LIBOMP_PERL_SCRIPT_ARCH} --expected="${libomp_expected_library_deps}" ${LIBOMP_OUTPUT_DIRECTORY}/${LIBOMP_LIB_FILE} COMMAND ${CMAKE_COMMAND} -E touch test-deps/.success DEPENDS omp ${LIBOMP_TOOLS_DIR}/check-depends.pl ) diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake index 6a78a7aebc5..b6e4e4ced51 100644 --- a/openmp/runtime/cmake/config-ix.cmake +++ b/openmp/runtime/cmake/config-ix.cmake @@ -144,8 +144,8 @@ endif() # Find perl executable # Perl is used to create omp.h (and other headers) along with kmp_i18n_id.inc and kmp_i18n_default.inc find_package(Perl REQUIRED) -# The perl scripts take the --os= flag which expects a certain format for operating systems. Until the -# perl scripts are removed, the most portable way to handle this is to have all operating systems that +# The perl scripts take the --os=/--arch= flags which expect a certain format for operating systems and arch's. +# Until the perl scripts are removed, the most portable way to handle this is to have all operating systems that # are neither Windows nor Mac (Most Unix flavors) be considered lin to the perl scripts. This is rooted # in that all the Perl scripts check the operating system and will fail if it isn't "valid". This # temporary solution lets us avoid trying to enumerate all the possible OS values inside the Perl modules. @@ -156,6 +156,15 @@ elseif(APPLE) else() set(LIBOMP_PERL_SCRIPT_OS lin) endif() +if(IA32) + set(LIBOMP_PERL_SCRIPT_ARCH 32) +elseif(MIC) + set(LIBOMP_PERL_SCRIPT_ARCH mic) +elseif(INTEL64) + set(LIBOMP_PERL_SCRIPT_ARCH 32e) +else() + set(LIBOMP_PERL_SCRIPT_ARCH ${LIBOMP_ARCH}) +endif() # Checking features # Check if version symbol assembler directives are supported |
