This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 058cf72626034933a912adeb151aac0244140df7
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Sun Oct 16 01:21:41 2016 +0200
debian/patches/i386/local-cpuid-level2.diff: replace by upstream patch
cvs-cpuid-level2.diff.
---
debian/changelog | 2 ++
debian/patches/i386/cvs-cpuid-level2.diff | 19 +++++++++++++++++++
debian/patches/i386/local-cpuid-level2.diff | 21 ---------------------
debian/patches/series | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index be785c8..a0b424c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium
combining. Closes: #840199.
* debian/debhelper.in/locales.postinst: improve locales-all detection.
Closes: #840901.
+ * debian/patches/i386/local-cpuid-level2.diff: replace by upstream patch
+ cvs-cpuid-level2.diff.
-- Aurelien Jarno <aure...@debian.org> Sat, 17 Sep 2016 20:03:04 +0200
diff --git a/debian/patches/i386/cvs-cpuid-level2.diff
b/debian/patches/i386/cvs-cpuid-level2.diff
new file mode 100644
index 0000000..d8a3be9
--- /dev/null
+++ b/debian/patches/i386/cvs-cpuid-level2.diff
@@ -0,0 +1,19 @@
+2016-10-12 H.J. Lu <hongjiu...@intel.com>
+
+ [BZ #20647]
+ * sysdeps/x86/cacheinfo.c (handle_intel): Return -1 if the
+ maximum CPUID level is less than 2.
+
+--- a/sysdeps/x86/cacheinfo.c
++++ b/sysdeps/x86/cacheinfo.c
+@@ -259,7 +259,9 @@ intel_check_word (int name, unsigned int value, bool
*has_level_2,
+ static long int __attribute__ ((noinline))
+ handle_intel (int name, unsigned int maxidx)
+ {
+- assert (maxidx >= 2);
++ /* Return -1 for older CPUs. */
++ if (maxidx < 2)
++ return -1;
+
+ /* OK, we can use the CPUID instruction to get all info about the
+ caches. */
diff --git a/debian/patches/i386/local-cpuid-level2.diff
b/debian/patches/i386/local-cpuid-level2.diff
deleted file mode 100644
index 1c635ce..0000000
--- a/debian/patches/i386/local-cpuid-level2.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- sysdeps/x86/cacheinfo.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/sysdeps/x86/cacheinfo.c
-+++ b/sysdeps/x86/cacheinfo.c
-@@ -303,7 +303,13 @@
- static long int __attribute__ ((noinline))
- handle_intel (int name, unsigned int maxidx)
- {
-- assert (maxidx >= 2);
-+ if (maxidx < 2)
-+ {
-+ /* This should never happen as all Intel i686 CPU support a CPUID
-+ level of 2 minimum. However valgrind sometimes load the i686
-+ library with a P55C CPUID. Return 0 in that case. */
-+ return 0;
-+ }
-
- /* OK, we can use the CPUID instruction to get all info about the
- caches. */
diff --git a/debian/patches/series b/debian/patches/series
index 5389cb9..819834e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -136,7 +136,7 @@ hurd-i386/cvs-setcancelstate.diff
i386/local-biarch.diff
i386/local-cmov.diff
-i386/local-cpuid-level2.diff
+i386/cvs-cpuid-level2.diff
i386/unsubmitted-quiet-ldconfig.diff
kfreebsd/submitted-waitid.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
