From a9558b49b3336aba143b68279af90d69e2d92479 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 8 May 2016 08:49:02 -0700
Subject: [PATCH] Move sysdeps/x86_64/cacheinfo.c to sysdeps/x86

Move sysdeps/x86_64/cacheinfo.c to sysdeps/x86.  No code changes on x86
and x86_64.

	* sysdeps/i386/cacheinfo.c: Include <sysdeps/x86/cacheinfo.c>
	instead of <sysdeps/x86_64/cacheinfo.c>.
	* sysdeps/x86_64/cacheinfo.c: Moved to ...
	* sysdeps/x86/cacheinfo.c: Here.
---
 ChangeLog                           | 7 +++++++
 sysdeps/i386/cacheinfo.c            | 2 +-
 sysdeps/{x86_64 => x86}/cacheinfo.c | 0
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename sysdeps/{x86_64 => x86}/cacheinfo.c (100%)

diff --git a/ChangeLog b/ChangeLog
index 30ab0e8075..4677e87194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/cacheinfo.c: Include <sysdeps/x86/cacheinfo.c>
+	instead of <sysdeps/x86_64/cacheinfo.c>.
+	* sysdeps/x86_64/cacheinfo.c: Moved to ...
+	* sysdeps/x86/cacheinfo.c: Here.
+
 2016-05-04  Florian Weimer  <fweimer@redhat.com>
 
 	* malloc/malloc-internal.h: Adjust header file guard.
diff --git a/sysdeps/i386/cacheinfo.c b/sysdeps/i386/cacheinfo.c
index 0b50c6d346..f15fe0779a 100644
--- a/sysdeps/i386/cacheinfo.c
+++ b/sysdeps/i386/cacheinfo.c
@@ -1,3 +1,3 @@
 #define DISABLE_PREFETCHW
 
-#include <sysdeps/x86_64/cacheinfo.c>
+#include <sysdeps/x86/cacheinfo.c>
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86/cacheinfo.c
similarity index 100%
rename from sysdeps/x86_64/cacheinfo.c
rename to sysdeps/x86/cacheinfo.c