This is an archive of the discontinued LLVM Phabricator instance.

Differential D59561

Make __cpu_model a hidden symbol, to match libgcc.
ClosedPublic

Authored by saugustine on Mar 19 2019, 2:05 PM.

Details

Reviewers
asbirlea
echristo
kongyi
Commits
rG86724e40bfa5: Make __cpu_model a hidden symbol, to match libgcc. Also hide…
rCRT356581: Make __cpu_model a hidden symbol, to match libgcc.
rL356581: Make __cpu_model a hidden symbol, to match libgcc.
Summary

Make __cpu_model a hidden symbol, to match libgcc.

Diff Detail

Event Timeline

saugustine created this revision.Mar 19 2019, 2:05 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2019, 2:05 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
saugustine added reviewers: asbirlea, echristo.Mar 19 2019, 2:05 PM
Harbormaster completed remote builds in B29371: Diff 191392.Mar 19 2019, 2:05 PM
kongyi added a reviewer: kongyi.Mar 19 2019, 5:08 PM
kongyi added a subscriber: kongyi.
kongyi added inline comments.
compiler-rt/lib/builtins/cpu_model.c
606

Please also mark __cpu_features2 as hidden.

hhb added a subscriber: hhb.Mar 19 2019, 5:43 PM
hhb added inline comments.
compiler-rt/lib/builtins/cpu_model.c
615

And __cpu_indicator_init just in case. It is already used as hidden symbol in __builtin_cpu_init codegen.

saugustine updated this revision to Diff 191518.Mar 20 2019, 9:50 AM
  • Also hide __cpu_inicator_init for similar reasons.
Harbormaster completed remote builds in B29399: Diff 191518.Mar 20 2019, 9:53 AM
saugustine updated this revision to Diff 191523.Mar 20 2019, 10:09 AM
saugustine marked 2 inline comments as done.

Make cpu_model a hidden symbol, to match libgcc.
Also cpu_features2 and __cpu_indicator_init.

saugustine added a comment.Mar 20 2019, 10:10 AM

Thanks. I've hidden a couple more symbols Please take another look.

Harbormaster completed remote builds in B29400: Diff 191523.Mar 20 2019, 10:10 AM
asbirlea accepted this revision.Mar 20 2019, 10:22 AM

lgtm.

This revision is now accepted and ready to land.Mar 20 2019, 10:22 AM
Closed by commit rL356581: Make __cpu_model a hidden symbol, to match libgcc. (authored by saugustine). · Explain WhyMar 20 2019, 10:37 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptMar 20 2019, 10:37 AM

Revision Contents

PathSize
compiler-rt/
lib/
builtins/
3 lines

Diff 191392

compiler-rt/lib/builtins/cpu_model.c

Show First 20 Lines • Show All 588 Lines • ▼ Show 20 Lines
#else #else
// FIXME: For MSVC, we should make a function pointer global in .CRT$X?? so that // FIXME: For MSVC, we should make a function pointer global in .CRT$X?? so that
// this runs during initialization. // this runs during initialization.
#define CONSTRUCTOR_ATTRIBUTE #define CONSTRUCTOR_ATTRIBUTE
#endif #endif
int __cpu_indicator_init(void) CONSTRUCTOR_ATTRIBUTE; int __cpu_indicator_init(void) CONSTRUCTOR_ATTRIBUTE;
#ifndef _WIN32
__attribute__((visibility("hidden")))
#endif
struct __processor_model { struct __processor_model {
unsigned int __cpu_vendor; unsigned int __cpu_vendor;
unsigned int __cpu_type; unsigned int __cpu_type;
unsigned int __cpu_subtype; unsigned int __cpu_subtype;
unsigned int __cpu_features[1]; unsigned int __cpu_features[1];
} __cpu_model = {0, 0, 0, {0}}; } __cpu_model = {0, 0, 0, {0}};
unsigned int __cpu_features2; unsigned int __cpu_features2;
kongyiUnsubmitted
Done
ReplyInline Actions

Please also mark __cpu_features2 as hidden.

kongyi: Please also mark `__cpu_features2` as hidden.
/* A constructor function that is sets __cpu_model and __cpu_features2 with /* A constructor function that is sets __cpu_model and __cpu_features2 with
the right values. This needs to run only once. This constructor is the right values. This needs to run only once. This constructor is
given the highest priority and it should run before constructors without given the highest priority and it should run before constructors without
the priority set. However, it still runs after ifunc initializers and the priority set. However, it still runs after ifunc initializers and
needs to be called explicitly there. */ needs to be called explicitly there. */
int CONSTRUCTOR_ATTRIBUTE int CONSTRUCTOR_ATTRIBUTE
__cpu_indicator_init(void) { __cpu_indicator_init(void) {
hhbUnsubmitted
Done
ReplyInline Actions

And __cpu_indicator_init just in case. It is already used as hidden symbol in __builtin_cpu_init codegen.

hhb: And `__cpu_indicator_init` just in case. It is already used as hidden symbol in…
unsigned EAX, EBX, ECX, EDX; unsigned EAX, EBX, ECX, EDX;
unsigned MaxLeaf = 5; unsigned MaxLeaf = 5;
unsigned Vendor; unsigned Vendor;
unsigned Model, Family, Brand_id; unsigned Model, Family, Brand_id;
unsigned Features = 0; unsigned Features = 0;
unsigned Features2 = 0; unsigned Features2 = 0;
/* This function needs to run just once. */ /* This function needs to run just once. */
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines