about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-05-08 08:49:02 -0700
committerH.J. Lu <hjl.tools@gmail.com>2016-05-08 08:49:18 -0700
commita9558b49b3336aba143b68279af90d69e2d92479 (patch)
treeae765e6925082b9f18b4b25ba30b15180c3c3ea4
parentb86970392c334a67156348a83f707bba0908511f (diff)
downloadglibc-a9558b49b3336aba143b68279af90d69e2d92479.tar.gz
glibc-a9558b49b3336aba143b68279af90d69e2d92479.tar.xz
glibc-a9558b49b3336aba143b68279af90d69e2d92479.zip
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.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/i386/cacheinfo.c2
-rw-r--r--sysdeps/x86/cacheinfo.c (renamed from sysdeps/x86_64/cacheinfo.c)0
3 files changed, 8 insertions, 1 deletions
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
index 143b3333a8..143b3333a8 100644
--- a/sysdeps/x86_64/cacheinfo.c
+++ b/sysdeps/x86/cacheinfo.c