diff options
author | Florian Weimer <fweimer@redhat.com> | 2018-05-23 13:13:05 +0200 |
---|---|---|
committer | Florian Weimer <fw@gcc.gnu.org> | 2018-05-23 13:13:05 +0200 |
commit | cb3c90cc4253cc236a4d5669a893562b202570e5 (patch) | |
tree | f949dbb7958ca1eeed9204b05d8ea39418b7ac22 /libatomic/config/x86/init.c | |
parent | 159440699bf6f97dccc94377d9d69e540a1904dc (diff) |
x86: libatomic: Do not assume ELF constructors run before IFUNC resolvers
PR libgcc/60790
x86: Do not assume ELF constructors run before IFUNC resolvers.
* config/x86/host-config.h (libat_feat1_ecx, libat_feat1_edx):
Remove declarations.
(__libat_feat1, __libat_feat1_init): Declare.
(FEAT1_REGISTER): Define.
(load_feat1): New function.
(IFUNC_COND_1): Adjust.
* config/x86/init.c (libat_feat1_ecx, libat_feat1_edx)
(init_cpuid): Remove definitions.
(__libat_feat1): New variable.
(__libat_feat1_init): New function.
From-SVN: r260603
Diffstat (limited to 'libatomic/config/x86/init.c')
-rw-r--r-- | libatomic/config/x86/init.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libatomic/config/x86/init.c b/libatomic/config/x86/init.c index 8b9ccd3b3de..5a4cf8b0456 100644 --- a/libatomic/config/x86/init.c +++ b/libatomic/config/x86/init.c @@ -26,13 +26,17 @@ #if HAVE_IFUNC -unsigned int libat_feat1_ecx, libat_feat1_edx; +unsigned int __libat_feat1; -static void __attribute__((constructor)) -init_cpuid (void) +unsigned int +__libat_feat1_init (void) { - unsigned int eax, ebx; - __get_cpuid (1, &eax, &ebx, &libat_feat1_ecx, &libat_feat1_edx); + unsigned int eax, ebx, ecx, edx; + FEAT1_REGISTER = 0; + __get_cpuid (1, &eax, &ebx, &ecx, &edx); + /* See the load in load_feat1. */ + __atomic_store_n (&__libat_feat1, FEAT1_REGISTER, __ATOMIC_RELAXED); + return FEAT1_REGISTER; } #endif /* HAVE_IFUNC */ |