implement feedback

Author: ro-i

openmp/runtime/CMakeLists.txt

@@ -127,6 +127,19 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH)
   set(CMAKE_MACOSX_RPATH TRUE)
 endif()
 
+# Remove any cmake-automatic linking of the standard C++ library.
+# We neither need (nor want) the standard C++ library dependency even though we compile c++ files.
+if(NOT ${LIBOMP_USE_STDCPPLIB})
+  set(LIBOMP_LINKER_LANGUAGE C)
+  set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
+else()
+  set(LIBOMP_LINKER_LANGUAGE CXX)
+endif()
+
+if(UNIX)
+  set(LIBOMP_DL_LIBS ${CMAKE_DL_LIBS})
+endif()
+
 # User specified flags.  These are appended to the configured flags.
 set(LIBOMP_CXXFLAGS "" CACHE STRING
   "Appended user specified C++ compiler flags.")

openmp/runtime/cmake/LibompHandleFlags.cmake

@@ -97,6 +97,7 @@ endfunction()
 
 # Linker flags
 function(libomp_get_ldflags ldflags)
+  cmake_parse_arguments(ARG "FOR_UNITTESTS" "" "" ${ARGN})
   set(ldflags_local)
   libomp_append(ldflags_local "${CMAKE_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_LIB_NAME}.def"
     IF_DEFINED CMAKE_LINK_DEF_FILE_FLAG)
@@ -105,7 +106,11 @@ function(libomp_get_ldflags ldflags)
   libomp_append(ldflags_local "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}${LIBOMP_VERSION_MAJOR}.${LIBOMP_VERSION_MINOR}"
     IF_DEFINED CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG)
   libomp_append(ldflags_local -Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
-  libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+  if(ARG_FOR_UNITTESTS)
+    libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+  else()
+    libomp_append(ldflags_local "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+  endif()
   libomp_append(ldflags_local -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
   libomp_append(ldflags_local -Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
   libomp_append(ldflags_local -no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG)

openmp/runtime/src/CMakeLists.txt

@@ -153,19 +153,6 @@ libomp_get_asmflags(LIBOMP_CONFIGURED_ASMFLAGS)
 set_source_files_properties(${LIBOMP_CXXFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CXXFLAGS}")
 set_source_files_properties(${LIBOMP_ASMFILES} ${LIBOMP_GNUASMFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_ASMFLAGS}")
 
-# Remove any cmake-automatic linking of the standard C++ library.
-# We neither need (nor want) the standard C++ library dependency even though we compile c++ files.
-if(NOT ${LIBOMP_USE_STDCPPLIB})
-  set(LIBOMP_LINKER_LANGUAGE C)
-  set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
-else()
-  set(LIBOMP_LINKER_LANGUAGE CXX)
-endif()
-
-if(UNIX)
-  set(LIBOMP_DL_LIBS ${CMAKE_DL_LIBS})
-endif()
-
 # Disable libstdc++ assertions, even in an LLVM_ENABLE_ASSERTIONS build, to
 # avoid an unwanted dependency on libstdc++.so.
 add_compile_definitions(_GLIBCXX_NO_ASSERTIONS)

openmp/runtime/test/lit.cfg

@@ -41,6 +41,9 @@ config.name = 'libomp'
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes = ['.c', '.cpp']
 
+# Exclude Unit tests - they are run separately via check-libomp-unit
+config.excludes = ['Unit']
+
 if config.test_fortran_compiler:
     lit_config.note("OpenMP Fortran tests enabled")
     config.suffixes += ['.f90', '.F90']

openmp/runtime/unittests/CMakeLists.txt

@@ -10,21 +10,8 @@ endif()
 # This library uses the same compiled objects as libomp, but with all symbols
 # exported to allow testing internal functions.
 
-libomp_get_ldflags(LIBOMP_TEST_LDFLAGS)
+libomp_get_ldflags(LIBOMP_TEST_LDFLAGS FOR_UNITTESTS)
 libomp_get_libflags(LIBOMP_TEST_LIBFLAGS)
-# Replace the libomp exports with the test exports exporting all symbols.
-if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
-  string(REPLACE "${LIBOMP_SRC_DIR}/exports_so.txt"
-                  "${LIBOMP_SRC_DIR}/exports_test_so.txt"
-                  LIBOMP_TEST_LDFLAGS "${LIBOMP_TEST_LDFLAGS}")
-endif()
-# Duplicate setting of LIBOMP_LINKER_LANGUAGE to match libomp.
-if(NOT ${LIBOMP_USE_STDCPPLIB})
-  set(LIBOMP_LINKER_LANGUAGE C)
-  set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
-else()
-  set(LIBOMP_LINKER_LANGUAGE CXX)
-endif()
 
 # Create the testing library from the same objects as libomp.
 add_library(omp_testing SHARED $<TARGET_OBJECTS:obj.omp>)