aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-08-20 04:29:23 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-20 04:29:23 -0700
commit1ae6c72dc10806d416a611ea8cc15640f972ffa7 (patch)
treebe2d04895be5bfe7996ac4aeaa7c0d5e4307b7d7
parenta452ef24d56280f19a629555285ba23ddff055e6 (diff)
downloadglibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.zip
glibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.tar.gz
glibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.tar.bz2
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.
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/i386/i686/multiarch/init-arch.h1
-rw-r--r--sysdeps/unix/sysv/linux/x86/init-arch.h1
-rw-r--r--sysdeps/x86/init-arch.h (renamed from sysdeps/x86_64/multiarch/init-arch.h)0
-rw-r--r--sysdeps/x86_64/cacheinfo.c2
5 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 52f163e..1de3a23 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 cd2d0be..0000000
--- 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 cd2d0be..0000000
--- 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
index 2b9988e..2b9988e 100644
--- a/sysdeps/x86_64/multiarch/init-arch.h
+++ b/sysdeps/x86/init-arch.h
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c
index 0ff5309..e7c65f7 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