This is an archive of the discontinued LLVM Phabricator instance.

Differential D41945

Fix for libomp static build
ClosedPublic

Authored by AndreyChurbanov on Jan 11 2018, 3:42 AM.

Details

Reviewers
tlwilmar
hbae
jlpeyton
Commits
rG5388acd3de11: Fixed libomp static build broken by the commit rL322202.
rOMP322282: Fixed libomp static build broken by the commit rL322202.
rL322282: Fixed libomp static build broken by the commit rL322202.
Summary

Bug introduced by commit rL322202, ittnotify call was not guarded with USE_ITT_BUILD macro.

Diff Detail

Repository
rL LLVM

Event Timeline

AndreyChurbanov created this revision.Jan 11 2018, 3:42 AM
Herald added a subscriber: openmp-commits. · View Herald TranscriptJan 11 2018, 3:42 AM
hbae accepted this revision.Jan 11 2018, 6:48 AM

LGTM

This revision is now accepted and ready to land.Jan 11 2018, 6:48 AM
Closed by commit rL322282: Fixed libomp static build broken by the commit rL322202. (authored by achurbanov). · Explain WhyJan 11 2018, 7:11 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 11 2018, 7:11 AM

Revision Contents

PathSize
openmp/
trunk/
runtime/
src/
2 lines

Diff 129450

openmp/trunk/runtime/src/z_Linux_util.cpp

Show First 20 Lines • Show All 1,335 Lines • ▼ Show 20 Lines#endif
__kmp_init_runtime = FALSE; __kmp_init_runtime = FALSE;
/* reset statically initialized locks */ /* reset statically initialized locks */
__kmp_init_bootstrap_lock(&__kmp_initz_lock); __kmp_init_bootstrap_lock(&__kmp_initz_lock);
__kmp_init_bootstrap_lock(&__kmp_stdio_lock); __kmp_init_bootstrap_lock(&__kmp_stdio_lock);
__kmp_init_bootstrap_lock(&__kmp_console_lock); __kmp_init_bootstrap_lock(&__kmp_console_lock);
__kmp_init_bootstrap_lock(&__kmp_task_team_lock); __kmp_init_bootstrap_lock(&__kmp_task_team_lock);
#if USE_ITT_BUILD
__kmp_itt_reset(); // reset ITT's global state __kmp_itt_reset(); // reset ITT's global state
#endif /* USE_ITT_BUILD */
/* This is necessary to make sure no stale data is left around */ /* This is necessary to make sure no stale data is left around */
/* AC: customers complain that we use unsafe routines in the atfork /* AC: customers complain that we use unsafe routines in the atfork
handler. Mathworks: dlsym() is unsafe. We call dlsym and dlopen handler. Mathworks: dlsym() is unsafe. We call dlsym and dlopen
in dynamic_link when check the presence of shared tbbmalloc library. in dynamic_link when check the presence of shared tbbmalloc library.
Suggestion is to make the library initialization lazier, similar Suggestion is to make the library initialization lazier, similar
to what done for __kmpc_begin(). */ to what done for __kmpc_begin(). */
// TODO: synchronize all static initializations with regular library // TODO: synchronize all static initializations with regular library
▲ Show 20 Lines • Show All 1,025 Lines • Show Last 20 Lines