glibc/cpuid-assertion.patch
Andreas Schwab 840aeb3750 Accepting request 434696 from home:Andreas_Schwab:Factory
- cpuid-assertion.patch: Don't assert on older Intel CPUs (BZ #20647)

- glibc-2.3.3-nscd-db-path.diff: Move persistent nscd databases to
  /var/lib/nscd
- glibc-2.3.90-langpackdir.diff: simplify

OBS-URL: https://build.opensuse.org/request/show/434696
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=447
2016-10-13 09:25:07 +00:00

22 lines
688 B
Diff

2016-10-12 H.J. Lu <hongjiu.lu@intel.com>
[BZ #20647]
* sysdeps/x86/cacheinfo.c (handle_intel): Return -1 if the
maximum CPUID level is less than 2.
Index: glibc-2.24/sysdeps/x86/cacheinfo.c
===================================================================
--- glibc-2.24.orig/sysdeps/x86/cacheinfo.c
+++ glibc-2.24/sysdeps/x86/cacheinfo.c
@@ -259,7 +259,9 @@ intel_check_word (int name, unsigned int
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. */