diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-05-11 05:49:09 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-05-11 05:51:39 -0700 |
| commit | 2a1f15b1a9d51c2ba3f217641ea3af96ea208061 (patch) | |
| tree | 1cfbc0d0b663f9d66b3636fdc43659f375011267 /sysdeps/x86 | |
| parent | 8da7d8f877d1eeb02cd00dd3ce1f13da951e72b0 (diff) | |
| download | glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar.gz glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar.xz glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.zip | |
Remove x86 ifunc-defines.sym and rtld-global-offsets.sym
Merge x86 ifunc-defines.sym with x86 cpu-features-offsets.sym. Remove x86 ifunc-defines.sym and rtld-global-offsets.sym. No code changes on i686 and x86-64. * sysdeps/i386/i686/multiarch/Makefile (gen-as-const-headers): Remove ifunc-defines.sym. * sysdeps/x86_64/multiarch/Makefile (gen-as-const-headers): Likewise. * sysdeps/i386/i686/multiarch/ifunc-defines.sym: Removed. * sysdeps/x86/rtld-global-offsets.sym: Likewise. * sysdeps/x86_64/multiarch/ifunc-defines.sym: Likewise. * sysdeps/x86/Makefile (gen-as-const-headers): Remove rtld-global-offsets.sym. * sysdeps/x86_64/multiarch/ifunc-defines.sym: Merged with ... * sysdeps/x86/cpu-features-offsets.sym: This. * sysdeps/x86/cpu-features.h: Include <cpu-features-offsets.h> instead of <ifunc-defines.h> and <rtld-global-offsets.h>.
Diffstat (limited to 'sysdeps/x86')
| -rw-r--r-- | sysdeps/x86/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/x86/cpu-features-offsets.sym | 16 | ||||
| -rw-r--r-- | sysdeps/x86/cpu-features.h | 3 | ||||
| -rw-r--r-- | sysdeps/x86/rtld-global-offsets.sym | 7 |
4 files changed, 18 insertions, 10 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 0de4f42168..0d0326c21a 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -1,5 +1,5 @@ ifeq ($(subdir),csu) -gen-as-const-headers += cpu-features-offsets.sym rtld-global-offsets.sym +gen-as-const-headers += cpu-features-offsets.sym endif ifeq ($(subdir),elf) diff --git a/sysdeps/x86/cpu-features-offsets.sym b/sysdeps/x86/cpu-features-offsets.sym index a9d53d195f..f6739fae81 100644 --- a/sysdeps/x86/cpu-features-offsets.sym +++ b/sysdeps/x86/cpu-features-offsets.sym @@ -5,3 +5,19 @@ #define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET rtld_global_ro_offsetof (_dl_x86_cpu_features) + +CPU_FEATURES_SIZE sizeof (struct cpu_features) +CPUID_OFFSET offsetof (struct cpu_features, cpuid) +CPUID_SIZE sizeof (struct cpuid_registers) +CPUID_EAX_OFFSET offsetof (struct cpuid_registers, eax) +CPUID_EBX_OFFSET offsetof (struct cpuid_registers, ebx) +CPUID_ECX_OFFSET offsetof (struct cpuid_registers, ecx) +CPUID_EDX_OFFSET offsetof (struct cpuid_registers, edx) +FAMILY_OFFSET offsetof (struct cpu_features, family) +MODEL_OFFSET offsetof (struct cpu_features, model) +FEATURE_OFFSET offsetof (struct cpu_features, feature) +FEATURE_SIZE sizeof (unsigned int) + +COMMON_CPUID_INDEX_1 +COMMON_CPUID_INDEX_7 +FEATURE_INDEX_1 diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h index 8f946c4f6f..9529d61ff5 100644 --- a/sysdeps/x86/cpu-features.h +++ b/sysdeps/x86/cpu-features.h @@ -74,8 +74,7 @@ #ifdef __ASSEMBLER__ -# include <ifunc-defines.h> -# include <rtld-global-offsets.h> +# include <cpu-features-offsets.h> # define index_cpu_CX8 COMMON_CPUID_INDEX_1*CPUID_SIZE+CPUID_EDX_OFFSET # define index_cpu_CMOV COMMON_CPUID_INDEX_1*CPUID_SIZE+CPUID_EDX_OFFSET diff --git a/sysdeps/x86/rtld-global-offsets.sym b/sysdeps/x86/rtld-global-offsets.sym deleted file mode 100644 index a9d53d195f..0000000000 --- a/sysdeps/x86/rtld-global-offsets.sym +++ /dev/null @@ -1,7 +0,0 @@ -#define SHARED 1 - -#include <ldsodefs.h> - -#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) - -RTLD_GLOBAL_RO_DL_X86_CPU_FEATURES_OFFSET rtld_global_ro_offsetof (_dl_x86_cpu_features) |