This is an archive of the discontinued LLVM Phabricator instance.

Differential D143200

[OpenMP][libomp] Fix CMake version symbol testing
ClosedPublic

Authored by jlpeyton on Feb 2 2023, 9:40 AM.

Details

Reviewers
tianshilei1992
jdoerfert
Commits
rGc32022ad260a: [OpenMP][libomp] Fix CMake version symbol testing
Summary

Do not check for version symbol support if the necessary linker flag is not supported.

Diff Detail

Event Timeline

jlpeyton created this revision.Feb 2 2023, 9:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 2 2023, 9:40 AM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
jlpeyton requested review of this revision.Feb 2 2023, 9:40 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptFeb 2 2023, 9:40 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B211524: Diff 494341.Feb 2 2023, 9:43 AM
jlpeyton updated this revision to Diff 494429.Feb 2 2023, 2:25 PM

Some linkers error out with a wildcard in both the global and local section under a version symbol. Removed the local part.

Harbormaster completed remote builds in B211579: Diff 494429.Feb 2 2023, 2:29 PM
tianshilei1992 accepted this revision.Feb 2 2023, 7:00 PM

LG, thanks!

This revision is now accepted and ready to land.Feb 2 2023, 7:00 PM
jlpeyton edited the summary of this revision. (Show Details)Feb 3 2023, 8:52 AM
Closed by commit rGc32022ad260a: [OpenMP][libomp] Fix CMake version symbol testing (authored by jlpeyton). · Explain WhyFeb 3 2023, 8:52 AM
This revision was automatically updated to reflect the committed changes.
jlpeyton added a commit: rGc32022ad260a: [OpenMP][libomp] Fix CMake version symbol testing.
thesamesam added a subscriber: thesamesam.Feb 3 2023, 10:16 AM

Revision Contents

PathSize
openmp/
runtime/
cmake/
6 lines
src/
4 lines

Diff 494664

openmp/runtime/cmake/config-ix.cmake

Show First 20 Lines • Show All 240 Lines • ▼ Show 20 Lines
elseif(INTEL64) elseif(INTEL64)
set(LIBOMP_PERL_SCRIPT_ARCH 32e) set(LIBOMP_PERL_SCRIPT_ARCH 32e)
else() else()
set(LIBOMP_PERL_SCRIPT_ARCH ${LIBOMP_ARCH}) set(LIBOMP_PERL_SCRIPT_ARCH ${LIBOMP_ARCH})
endif() endif()
# Checking features # Checking features
# Check if version symbol assembler directives are supported # Check if version symbol assembler directives are supported
if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
libomp_check_version_symbols(LIBOMP_HAVE_VERSION_SYMBOLS) libomp_check_version_symbols(LIBOMP_HAVE_VERSION_SYMBOLS)
else()
set(LIBOMP_HAVE_VERSION_SYMBOLS FALSE)
endif()
# Check if quad precision types are available # Check if quad precision types are available
if(CMAKE_C_COMPILER_ID STREQUAL "GNU") if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
set(LIBOMP_HAVE_QUAD_PRECISION TRUE) set(LIBOMP_HAVE_QUAD_PRECISION TRUE)
elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM") elseif(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
if(LIBOMP_HAVE_EXTENDED_FLOAT_TYPES_FLAG) if(LIBOMP_HAVE_EXTENDED_FLOAT_TYPES_FLAG)
set(LIBOMP_HAVE_QUAD_PRECISION TRUE) set(LIBOMP_HAVE_QUAD_PRECISION TRUE)
else() else()
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines

openmp/runtime/src/exports_test_so.txt

Show All 13 Lines
# version script it used we may error on undefined symbols and erroneously fail. # version script it used we may error on undefined symbols and erroneously fail.
VERSION { VERSION {
global: # Exported symbols. global: # Exported symbols.
*; # All symbols as exported for testing. *; # All symbols as exported for testing.
local: # Non-exported symbols.
*; # All other symbols are not exported.
}; # VERSION }; # VERSION
# sets up GCC OMP_ version dependency chain # sets up GCC OMP_ version dependency chain
OMP_1.0 { OMP_1.0 {
}; };
OMP_2.0 { OMP_2.0 {
} OMP_1.0; } OMP_1.0;
OMP_3.0 { OMP_3.0 {
Show All 27 Lines