From 2a1f15b1a9d51c2ba3f217641ea3af96ea208061 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 11 May 2016 05:49:09 -0700 Subject: [PATCH] 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 instead of and . --- ChangeLog | 16 +++++++++++++++ sysdeps/i386/i686/multiarch/Makefile | 1 - sysdeps/i386/i686/multiarch/ifunc-defines.sym | 19 ------------------ sysdeps/x86/Makefile | 2 +- sysdeps/x86/cpu-features-offsets.sym | 16 +++++++++++++++ sysdeps/x86/cpu-features.h | 3 +-- sysdeps/x86/rtld-global-offsets.sym | 7 ------- sysdeps/x86_64/multiarch/Makefile | 1 - sysdeps/x86_64/multiarch/ifunc-defines.sym | 20 ------------------- 9 files changed, 34 insertions(+), 51 deletions(-) delete mode 100644 sysdeps/i386/i686/multiarch/ifunc-defines.sym delete mode 100644 sysdeps/x86/rtld-global-offsets.sym delete mode 100644 sysdeps/x86_64/multiarch/ifunc-defines.sym diff --git a/ChangeLog b/ChangeLog index 2baca396c8..8958a06d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2016-05-11 H.J. Lu + + * 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 + instead of and . + 2016-05-10 Joseph Myers [BZ #20073] diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile index 700010d969..4a0c20c051 100644 --- a/sysdeps/i386/i686/multiarch/Makefile +++ b/sysdeps/i386/i686/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),csu) tests += test-multiarch -gen-as-const-headers += ifunc-defines.sym endif ifeq ($(subdir),string) diff --git a/sysdeps/i386/i686/multiarch/ifunc-defines.sym b/sysdeps/i386/i686/multiarch/ifunc-defines.sym deleted file mode 100644 index 96e9cfaf61..0000000000 --- a/sysdeps/i386/i686/multiarch/ifunc-defines.sym +++ /dev/null @@ -1,19 +0,0 @@ -#include "init-arch.h" -#include - --- - -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 -FEATURE_INDEX_1 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 -# include +# include # 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 - -#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) diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile index 8878efbc8f..d305145bf0 100644 --- a/sysdeps/x86_64/multiarch/Makefile +++ b/sysdeps/x86_64/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),csu) tests += test-multiarch -gen-as-const-headers += ifunc-defines.sym endif ifeq ($(subdir),string) diff --git a/sysdeps/x86_64/multiarch/ifunc-defines.sym b/sysdeps/x86_64/multiarch/ifunc-defines.sym deleted file mode 100644 index 3df946f343..0000000000 --- a/sysdeps/x86_64/multiarch/ifunc-defines.sym +++ /dev/null @@ -1,20 +0,0 @@ -#include "init-arch.h" -#include - --- - -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 -- 2.43.5