From 1ae6c72dc10806d416a611ea8cc15640f972ffa7 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 20 Aug 2015 04:29:23 -0700
Subject: [PATCH] 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.
---
 ChangeLog                                     | 9 +++++++++
 sysdeps/i386/i686/multiarch/init-arch.h       | 1 -
 sysdeps/unix/sysv/linux/x86/init-arch.h       | 1 -
 sysdeps/{x86_64/multiarch => x86}/init-arch.h | 0
 sysdeps/x86_64/cacheinfo.c                    | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 sysdeps/i386/i686/multiarch/init-arch.h
 delete mode 100644 sysdeps/unix/sysv/linux/x86/init-arch.h
 rename sysdeps/{x86_64/multiarch => x86}/init-arch.h (100%)

diff --git a/ChangeLog b/ChangeLog
index 52f163eb0c..1de3a2379e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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.
 	* sysdeps/unix/sysv/linux/x86/init-arch.c: Likewise.
 
diff --git a/sysdeps/i386/i686/multiarch/init-arch.h b/sysdeps/i386/i686/multiarch/init-arch.h
deleted file mode 100644
index cd2d0befee..0000000000
--- a/sysdeps/i386/i686/multiarch/init-arch.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.h>
diff --git a/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h
deleted file mode 100644
index cd2d0befee..0000000000
--- a/sysdeps/unix/sysv/linux/x86/init-arch.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.h>
diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86/init-arch.h
similarity index 100%
rename from sysdeps/x86_64/multiarch/init-arch.h
rename to sysdeps/x86/init-arch.h
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c
index 0ff5309e61..e7c65f7dd0 100644
--- 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
-- 
2.11.4.GIT