From 4facca0b0e0c99601673056352cd695102872828 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 13 May 2016 08:29:22 -0700 Subject: [PATCH] Call init_cpu_features only if SHARED is defined In static executable, since init_cpu_features is called early from __libc_start_main, there is no need to call it again in dl_platform_init. [BZ #20072] * sysdeps/i386/dl-machine.h (dl_platform_init): Call init_cpu_features only if SHARED is defined. * sysdeps/x86_64/dl-machine.h (dl_platform_init): Likewise. --- ChangeLog | 7 +++++++ sysdeps/i386/dl-machine.h | 4 ++++ sysdeps/x86_64/dl-machine.h | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 05d0fe7..8ccf928 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2016-05-13 H.J. Lu + [BZ #20072] + * sysdeps/i386/dl-machine.h (dl_platform_init): Call + init_cpu_features only if SHARED is defined. + * sysdeps/x86_64/dl-machine.h (dl_platform_init): Likewise. + +2016-05-13 H.J. Lu + * sysdeps/x86/cacheinfo.c (init_cacheinfo): Check and support non-inclusive caches on Intel processors. diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 130bcf5..4e3968a 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -237,7 +237,11 @@ dl_platform_init (void) /* Avoid an empty string which would disturb us. */ GLRO(dl_platform) = NULL; +#ifdef SHARED + /* init_cpu_features has been called early from __libc_start_main in + static executable. */ init_cpu_features (&GLRO(dl_x86_cpu_features)); +#endif } static inline Elf32_Addr diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 980ca73..ed0c1a8 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -224,7 +224,11 @@ dl_platform_init (void) /* Avoid an empty string which would disturb us. */ GLRO(dl_platform) = NULL; +#ifdef SHARED + /* init_cpu_features has been called early from __libc_start_main in + static executable. */ init_cpu_features (&GLRO(dl_x86_cpu_features)); +#endif } static inline ElfW(Addr) -- 2.7.4