Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix percpu ODR linker warning #257

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tcmalloc/internal/percpu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
GOOGLE_MALLOC_SECTION_BEGIN
namespace tcmalloc {
namespace tcmalloc_internal {
class Sampler;
namespace subtle {
namespace percpu {

Expand All @@ -62,7 +63,7 @@ ABSL_CONST_INIT static absl::once_flag init_per_cpu_once;
ABSL_CONST_INIT static std::atomic<bool> using_upstream_fence{false};
#endif // TCMALLOC_INTERNAL_PERCPU_USE_RSEQ

extern "C" thread_local char tcmalloc_sampler ABSL_ATTRIBUTE_INITIAL_EXEC;
extern "C" thread_local Sampler tcmalloc_sampler ABSL_ATTRIBUTE_INITIAL_EXEC;

static bool InitThreadPerCpu() {
// If we're already registered, there's nothing further for us to do.
Expand Down