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/i386/i686/multiarch | |
| parent | 8da7d8f877d1eeb02cd00dd3ce1f13da951e72b0 (diff) | |
| download | glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar.gz | |
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/i386/i686/multiarch')
| -rw-r--r-- | sysdeps/i386/i686/multiarch/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/ifunc-defines.sym | 19 |
2 files changed, 0 insertions, 20 deletions
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 <stddef.h> - --- - -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 |