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>.

diff --git a/ChangeLog b/ChangeLog
index 2baca39..8958a06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2016-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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>.
+
 2016-05-10  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #20073]

diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
index 700010d..4a0c20c 100644 (file)
--- 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 (file)
index 96e9cfa..0000000
--- 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

diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index 0de4f42..0d0326c 100644 (file)
--- 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 a9d53d1..f6739fa 100644 (file)
--- 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 8f946c4..9529d61 100644 (file)
--- 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 (file)
index a9d53d1..0000000
--- 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)

diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile
index 8878efb..d305145 100644 (file)
--- 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 (file)
index 3df946f..0000000
--- a/sysdeps/x86_64/multiarch/ifunc-defines.sym
+++ /dev/null
@@ -1,20 +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
-COMMON_CPUID_INDEX_7
-FEATURE_INDEX_1