This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-108-g1ae6c72
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Aug 2015 11:31:49 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-108-g1ae6c72
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 1ae6c72dc10806d416a611ea8cc15640f972ffa7 (commit)
from a452ef24d56280f19a629555285ba23ddff055e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1ae6c72dc10806d416a611ea8cc15640f972ffa7
commit 1ae6c72dc10806d416a611ea8cc15640f972ffa7
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Aug 20 04:29:23 2015 -0700
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.
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
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 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
-----------------------------------------------------------------------
Summary of changes:
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%)
hooks/post-receive
--
GNU C Library master sources