Move x86_64 init-arch.h to sysdeps/x86/init-arch.h

Move sysdeps/x86_64/multiarch/init-arch.h to sysdeps/x86/init-arch.h which can be used for both i386 and x86_64. * sysdeps/i386/i686/multiarch/init-arch.h: Removed. * sysdeps/unix/sysv/linux/x86/init-arch.h: Likewise. * sysdeps/x86_64/cacheinfo.c: Include <init-arch.h> instead of "multiarch/init-arch.h". * sysdeps/x86_64/multiarch/init-arch.h: Renamed to ... * sysdeps/x86/init-arch.h: This.
git-mirror · Aug 20, 2015 · 1ae6c72 · 1ae6c72
1 parent a452ef2
commit 1ae6c72
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i686/multiarch/init-arch.h: Removed.
+	* sysdeps/unix/sysv/linux/x86/init-arch.h: Likewise.
+	* sysdeps/x86_64/cacheinfo.c: Include <init-arch.h> instead
+	of "multiarch/init-arch.h".
+	* sysdeps/x86_64/multiarch/init-arch.h: Renamed to ...
+	* sysdeps/x86/init-arch.h: This.
+
 2015-08-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/i686/multiarch/init-arch.c: Removed.

diff --git a/sysdeps/i386/i686/multiarch/init-arch.h b/sysdeps/i386/i686/multiarch/init-arch.h
diff --git a/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h
diff --git a/sysdeps/x86_64/multiarch/init-arch.h → sysdeps/x86/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h → sysdeps/x86/init-arch.h
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <cpuid.h>
-#include "multiarch/init-arch.h"
+#include <init-arch.h>
 
 #define is_intel GLRO(dl_x86_cpu_features).kind == arch_kind_intel
 #define is_amd GLRO(dl_x86_cpu_features).kind == arch_kind_amd