aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/x86/cpu-features.h
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-05-11 05:49:09 -0700
committerH.J. Lu <hjl.tools@gmail.com>2016-05-11 05:51:39 -0700
commit2a1f15b1a9d51c2ba3f217641ea3af96ea208061 (patch)
tree1cfbc0d0b663f9d66b3636fdc43659f375011267 /sysdeps/x86/cpu-features.h
parent8da7d8f877d1eeb02cd00dd3ce1f13da951e72b0 (diff)
downloadglibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar
glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar.gz
glibc-2a1f15b1a9d51c2ba3f217641ea3af96ea208061.tar.bz2
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/cpu-features.h')
-rw-r--r--sysdeps/x86/cpu-features.h3
1 files changed, 1 insertions, 2 deletions
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