Hello community,

here is the log from the commit of package cpuid for openSUSE:Factory checked 
in at 2017-01-24 10:40:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cpuid (Old)
 and      /work/SRC/openSUSE:Factory/.cpuid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cpuid"

Changes:
--------
--- /work/SRC/openSUSE:Factory/cpuid/cpuid.changes      2016-12-10 
18:29:32.642722567 +0100
+++ /work/SRC/openSUSE:Factory/.cpuid.new/cpuid.changes 2017-01-24 
10:40:38.260752343 +0100
@@ -1,0 +2,19 @@
+Mon Jan 23 09:54:56 UTC 2017 - [email protected]
+
+- Update to new upstream release 20170122
+  * Added synth decoding for Intel Knights Landing B0.
+  * Added new synth decodings for Intel Kaby Lake.
+  * Fixed synth decodings for AMD Steamroller and Jaguar.
+  * Added synth decodings for AMD Puma and Excavator.
+  * For (6,15),(0,2) Piledriver processors, detect FX series and
+    report it as Vishera instead of Abu Dhabi/Seoul/Delhi.
+  * Added general microarchitecure names for AMD (e.g.
+    Piledriver) in addition to specific core names (e.g. Trinity)
+    for later generation processors. If I have trouble
+    remembering these, it seems likely other people do too.
+  * Added synth decoding for Quark X1000.
+  * Added Intel Atom Z2760 (Clover Trail).
+  * Added extra synth decodings for some Ivy Bridge and Sandy
+    Bridge processors.
+
+-------------------------------------------------------------------

Old:
----
  cpuid-20161201.src.tar.gz

New:
----
  cpuid-20170122.src.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cpuid.spec ++++++
--- /var/tmp/diff_new_pack.UGf1uF/_old  2017-01-24 10:40:38.676693275 +0100
+++ /var/tmp/diff_new_pack.UGf1uF/_new  2017-01-24 10:40:38.680692707 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cpuid
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           cpuid
-Version:        20161201
+Version:        20170122
 Release:        0
 Summary:        x86 CPU identification tool
 License:        GPL-2.0+

++++++ cpuid-20161201.src.tar.gz -> cpuid-20170122.src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/ChangeLog new/cpuid-20170122/ChangeLog
--- old/cpuid-20161201/ChangeLog        2016-12-01 15:19:01.000000000 +0100
+++ new/cpuid-20170122/ChangeLog        2017-01-22 21:51:24.000000000 +0100
@@ -1,3 +1,33 @@
+Sun Jan 22 2017 Todd Allen <[email protected]>
+       * Made new release.
+       * cpuid.c: Use __cpuid_count macro for "cpuid" instruction if possible.
+         This macro is present in gcc 4.3.0 and later, and works around the 
fact
+         that the cpuid instruction writes on the PIC register.  This is only
+         important when compiling PIC/PIE.
+       * cpuid.c: Added synth decoding for Intel Knights Landing B0.  The Intel
+         docs still don't specify the stepping numbers, but all examples seen
+         so far have stepping number 1, and so far B0 is the only stepping.
+       * cpuid.c: Added new synth decodings for Intel Kaby Lake.
+       * cpuid.c: Fixed synth decodings for AMD Steamroller.
+       * cpuid.c: Fixed synth decodings for AMD Jaguar.
+       * cpuid.c: Added synth decodings for AMD Puma.
+       * cpuid.c: Added synth decodings for AMD Excavator.
+       * cpuid.c: For (6,15),(0,2) Piledriver processors, detect FX series
+         and report it as Vishera instead of Abu Dhabi/Seoul/Delhi.
+       * cpuid.c: Added general microarchitecure names for AMD (e.g.
+         Piledriver) in addition to specific core names (e.g. Trinity) for
+         later generation processors.  If I have trouble remembering these,
+         it seems likely other people do too.
+       * cpuid.c: Added synth decoding for Quark X1000.
+       * cpuid.c: Added Intel Atom Z2760 (Clover Trail).
+       * cpuid.c; Added extra synth decodings for some Sandy Bridge processors.
+       * cpuid.c; Added extra synth decodings for some Ivy Bridge processors.
+       * cpuid.man: Added new & missing spec updates & revision guides.
+       * FUTURE: Cleaned this up somewhat.
+
+Mon Dec  5 2016 Todd Allen <[email protected]>
+       * cpuid.c: Removed stale len variable from do_file().
+
 Thu Dec  1 2016 Todd Allen <[email protected]>
        * Made new release.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/FUTURE new/cpuid-20170122/FUTURE
--- old/cpuid-20161201/FUTURE   2016-11-14 14:36:02.000000000 +0100
+++ new/cpuid-20170122/FUTURE   2017-01-22 21:03:20.000000000 +0100
@@ -1,17 +1,14 @@
-Intel: Skylake doesn't mention stepping numbers.  I have one example system, 
-       skylar.  Add any unknowns to this file.
-Intel: Atom S12x9 (Briarwood) is based on Cedarview, but the Intel docs provide
-       no CPUID identification values.  And I can find no examples online.  
Does
-       anyone know the CPUID family/model/steppings?
-Intel: I can find no cpuid information on Atom C1000 or Z2000.
-       (Possibly they are (0,6),(2,7) or (0,6),(3,5)?)
-AMD: Verify that (7,15,  0, 0,  1) really is steamroller.  
-     And are there more specific architecture names?
-AMD: Geneva (the Athlon II Neo counterpart of the Athlon II mobile Champlain, 
-             or the V-Series Champlain?) 
-            [not seen in any revision guides yet, though]
-AMD: Revision guides haven't been updated in years.  Is AMD dead yet?
+AMD: Ryzen/Zen (Q1 2017)
 
 These are not really future, but I have very little data on them:
+
+   Intel: Atom S12x9 (Briarwood) is based on Cedarview, but the Intel docs 
provide
+          no CPUID identification values.  And I can find no examples online.  
Does
+          anyone know the CPUID family/model/steppings?
+   Intel: I can find no cpuid information on Atom C1000 or Z2000.
+          (Possibly they are (0,6),(2,7) or (0,6),(3,5)?)
+   AMD: Geneva (the Athlon II Neo counterpart of the Athlon II mobile 
Champlain, 
+                or the V-Series Champlain?) 
+               [not seen in any revision guides yet, though]
    VIA: Nano 1000/2000 (Isaiah)
    VIA: Nano 3000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/Makefile new/cpuid-20170122/Makefile
--- old/cpuid-20161201/Makefile 2016-12-01 15:11:34.000000000 +0100
+++ new/cpuid-20170122/Makefile 2017-01-22 18:07:21.000000000 +0100
@@ -7,7 +7,7 @@
 CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -Wshadow -Wcast-align 
-Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings 
-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes 
-D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
 
 PACKAGE=cpuid
-VERSION=20161201
+VERSION=20170122
 RELEASE=1
 
 PROG=$(PACKAGE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/cpuid.c new/cpuid-20170122/cpuid.c
--- old/cpuid-20161201/cpuid.c  2016-11-30 15:34:23.000000000 +0100
+++ new/cpuid-20170122/cpuid.c  2017-01-22 21:51:17.000000000 +0100
@@ -1,6 +1,6 @@
 /*
 ** cpuid dumps CPUID information for each CPU.
-** Copyright 2003,2004,2005,2006,2010,2011,2012,2013,2014,2015,2016 by 
+** Copyright 2003,2004,2005,2006,2010,2011,2012,2013,2014,2015,2016,2017 by 
 ** Todd Allen.
 ** 
 ** This program is free software; you can redistribute it and/or
@@ -23,6 +23,10 @@
 #define USE_KERNEL_SCHED_SETAFFINITY
 #endif
 
+#if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40300
+#define USE_CPUID_COUNT
+#endif
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <sys/types.h>
@@ -39,6 +43,10 @@
 #include <linux/major.h>
 #endif
 
+#ifdef USE_CPUID_COUNT
+#include <cpuid.h>
+#endif
+
 #ifdef USE_KERNEL_SCHED_SETAFFINITY
 #include <sys/syscall.h>
 #else
@@ -1833,6 +1841,7 @@
    FMS (    0, 5,  0, 8,  1,     "Intel Pentium MMX P55C (A0), .25um");
    FMS (    0, 5,  0, 8,  2,     "Intel Pentium MMX P55C (B2), .25um");
    FM  (    0, 5,  0, 8,         "Intel Pentium MMX P55C, .25um");
+   FM  (    0, 5,  0, 9,         "Intel Quark X1000 / D1000 / D2000 / C1000 
(Lakemont), 32nm");
    F   (    0, 5,                "Intel Pentium (unknown model)");
    FM  (    0, 6,  0, 0,         "Intel Pentium Pro A-step");
    FMS (    0, 6,  0, 1,  1,     "Intel Pentium Pro (B0)");
@@ -2103,16 +2112,16 @@
    FMSQ(    0, 6,  2,10,  7, Mc, "Intel Mobile Core i3-2000 / Mobile Core 
i5-2000 / Mobile Core i7-2000 (Sandy Bridge D2/J1/Q0), 32nm");
    FMSQ(    0, 6,  2,10,  7, dc, "Intel Core i3-2000 / Core i5-2000 / Core 
i7-2000 (Sandy Bridge D2/J1/Q0), 32nm");
    FMSQ(    0, 6,  2,10,  7, MC, "Intel Celeron G400/G500/700/800/B800 (Sandy 
Bridge J1/Q0), 32nm");
-   FMSQ(    0, 6,  2,10,  7, sX, "Intel Xeon E3-1200 v1 (Sandy Bridge 
D2/J1/Q0), 32nm");
-   FMSQ(    0, 6,  2,10,  7, dP, "Intel Pentium G500/G600/G800 (Sandy Bridge 
Q0), 32nm");
-   FMS (    0, 6,  2,10,  7,     "Intel Core i3-2000 / Core i5-2000 / Core 
i7-2000 / Mobile Core i7-2000 (Sandy Bridge D2/J1/Q0) / Pentium G500/G600/G800 
(Sandy Bridge Q0) / Celeron G400/G500/700/800/B800 (Sandy Bridge J1/Q0) / Xeon 
E3-1200 (Sandy Bridge D2/J1/Q0), 32nm");
+   FMSQ(    0, 6,  2,10,  7, sX, "Intel Xeon E3-1100 / E3-1200 v1 (Sandy 
Bridge D2/J1/Q0), 32nm");
+   FMSQ(    0, 6,  2,10,  7, dP, "Intel Pentium G500/G600/G800 / Pentium B915C 
(Sandy Bridge Q0), 32nm");
+   FMS (    0, 6,  2,10,  7,     "Intel Core i3-2000 / Core i5-2000 / Core 
i7-2000 / Mobile Core i7-2000 (Sandy Bridge D2/J1/Q0) / Pentium G500/G600/G800 
/ Pentium B915C (Sandy Bridge Q0) / Celeron G400/G500/700/800/B800 (Sandy 
Bridge J1/Q0) / Xeon E1-1100 / E3-1200 (Sandy Bridge D2/J1/Q0), 32nm");
    FMQ (    0, 6,  2,10,     Xc, "Intel Mobile Core i7 Extreme (Sandy Bridge), 
32nm");
    FMQ (    0, 6,  2,10,     Mc, "Intel Mobile Core i3-2000 / Mobile Core 
i5-2000 / Mobile Core i7-2000 (Sandy Bridge), 32nm");
    FMQ (    0, 6,  2,10,     dc, "Intel Core i5-2000 / Core i7-2000 (Sandy 
Bridge), 32nm");
    FMQ (    0, 6,  2,10,     MC, "Intel Celeron G400/G500/700/800/B800 (Sandy 
Bridge), 32nm");
-   FMQ (    0, 6,  2,10,     sX, "Intel Xeon E3-1200 v1 (Sandy Bridge), 32nm");
-   FMQ (    0, 6,  2,10,     dP, "Intel Pentium G500/G600/G800 (Sandy Bridge), 
32nm");
-   FM  (    0, 6,  2,10,         "Intel Core i5-2000 / Core i7-2000 / Mobile 
Core i3-2000 / Mobile Core i5-2000 / Mobile Core i7-2000 / Pentium 
G500/G600/G800 / Celeron G400/G500/700/800/B800 / Xeon E3-1200 (Sandy Bridge), 
32nm");
+   FMQ (    0, 6,  2,10,     sX, "Intel Xeon E3-1100 / E3-1200 v1 (Sandy 
Bridge), 32nm");
+   FMQ (    0, 6,  2,10,     dP, "Intel Pentium G500/G600/G800 / Pentium B915C 
(Sandy Bridge), 32nm");
+   FM  (    0, 6,  2,10,         "Intel Core i5-2000 / Core i7-2000 / Mobile 
Core i3-2000 / Mobile Core i5-2000 / Mobile Core i7-2000 / Pentium 
G500/G600/G800 / Pentium B915C / Celeron G400/G500/700/800/B800 / Xeon E1-1100 
/ E3-1200 (Sandy Bridge), 32nm");
    FMSQ(    0, 6,  2,12,  2, dc, "Intel Core i7-900 / Core i7-980X (Gulftown 
B1), 32nm");
    FMSQ(    0, 6,  2,12,  2, sX, "Intel Xeon Processor 3600 (Westmere-EP B1) / 
Xeon Processor 5600 (Westmere-EP B1), 32nm");
    FMS (    0, 6,  2,12,  2,     "Intel Core i7-900 (Gulftown B1) / Core 
i7-980X (Gulftown B1) / Xeon Processor 3600 (Westmere-EP B1) / Xeon Processor 
5600 (Westmere-EP B1), 32nm");
@@ -2130,8 +2139,8 @@
    FM  (    0, 6,  2,14,         "Intel Xeon (Beckton), 45nm");
    FMS (    0, 6,  2,15,  2,     "Intel Xeon E7-8800 / Xeon E7-4800 / Xeon 
E7-2800 (Westmere-EX A2), 32nm");
    FM  (    0, 6,  2,15,         "Intel Xeon E7-8800 / Xeon E7-4800 / Xeon 
E7-2800 (Westmere-EX), 32nm");
-   FMS (    0, 6,  3, 5,  1,     "Intel Atom Z8000 (Cherry Trail C0), 14nm");
-   FM  (    0, 6,  3, 5,         "Intel Atom Z8000 (Cherry Trail), 14nm");
+   FMS (    0, 6,  3, 5,  1,     "Intel Atom Z2760 (Clover Trail C0) / Z8000 
(Cherry Trail C0), 14nm");
+   FM  (    0, 6,  3, 5,         "Intel Atom Z2760 (Clover Trail) / Z8000 
(Cherry Trail), 14nm");
    // Intel docs (328198) do not provide any FMS for Centerton, but an example
    // from [email protected] does.
    FMS (    0, 6,  3, 6,  1,     "Intel Atom D2000/N2000 (Cedarview B1/B2/B3) 
/ S1200 (Centerton B1), 32nm");
@@ -2145,14 +2154,14 @@
    FM  (    0, 6,  3, 7,         "Intel Pentium N3500 / J2850 / Celeron N1700 
/ N1800 / N2800 / N2900 (Bay Trail-M) / Atom Z3000 (Bay Trail-T), 22nm");
    FMSQ(    0, 6,  3,10,  9, Mc, "Intel Mobile Core i3-3000 (Ivy Bridge L1) / 
i5-3000 (Ivy Bridge L1) / i7-3000 (Ivy Bridge E1/L1) / Pentium 
900/1000/2000/2100 (P0), 22nm");
    FMSQ(    0, 6,  3,10,  9, dc, "Intel Core i3-3000 (Ivy Bridge L1) / i5-3000 
(Ivy Bridge E1/N0/L1) / i7-3000 (Ivy Bridge E1), 22nm");
-   FMSQ(    0, 6,  3,10,  9, sX, "Intel Xeon E3-1200 v2 (Ivy Bridge E1/N0/L1), 
22nm");
-   FMSQ(    0, 6,  3,10,  9, dP, "Intel Pentium G1600/G2000/G2100 (Ivy Bridge 
P0), 22nm");
-   FMS (    0, 6,  3,10,  9,     "Intel Core i3-3000 (Ivy Bridge L1) / i5-3000 
(Ivy Bridge E1/N0/L1) / i7-3000 (Ivy Bridge E1) / Mobile Core i3-3000 (Ivy 
Bridge L1) / i5-3000 (Ivy Bridge L1) / Mobile Core i7-3000 (Ivy Bridge E1/L1) / 
Xeon E3-1200 v2 (Ivy Bridge E1/N0/L1) / Pentium G1600/G2000/G2100 (Ivy Bridge 
P0) / Pentium 900/1000/2000/2100 (P0), 22nm");
+   FMSQ(    0, 6,  3,10,  9, sX, "Intel Xeon E3-1100 v2 / E3-1200 v2 (Ivy 
Bridge E1/N0/L1), 22nm");
+   FMSQ(    0, 6,  3,10,  9, dP, "Intel Pentium G1600/G2000/G2100 / Pentium 
B925C (Ivy Bridge P0), 22nm");
+   FMS (    0, 6,  3,10,  9,     "Intel Core i3-3000 (Ivy Bridge L1) / i5-3000 
(Ivy Bridge E1/N0/L1) / i7-3000 (Ivy Bridge E1) / Mobile Core i3-3000 (Ivy 
Bridge L1) / i5-3000 (Ivy Bridge L1) / Mobile Core i7-3000 (Ivy Bridge E1/L1) / 
Xeon E3-1100 v2 / E3-1200 v2 (Ivy Bridge E1/N0/L1) / Pentium G1600/G2000/G2100 
/ Pentium B925C (Ivy Bridge P0) / Pentium 900/1000/2000/2100 (P0), 22nm");
    FMQ (    0, 6,  3,10,     Mc, "Intel Mobile Core i3-3000 (Ivy Bridge) / 
Mobile Core i5-3000 (Ivy Bridge) / Mobile Core i7-3000 (Ivy Bridge) / Pentium 
900/1000/2000/2100, 22nm");
    FMQ (    0, 6,  3,10,     dc, "Intel Core i3-3000 (Ivy Bridge) / i5-3000 
(Ivy Bridge) / i7-3000 (Ivy Bridge), 22nm");
-   FMQ (    0, 6,  3,10,     sX, "Intel Xeon E3-1200 v2 (Ivy Bridge), 22nm");
-   FMQ (    0, 6,  3,10,     dP, "Intel Pentium G1600/G2000/G2100 (Ivy 
Bridge), 22nm");
-   FM  (    0, 6,  3,10,         "Intel Core i3-3000 (Ivy Bridge) / i5-3000 
(Ivy Bridge) / i7-3000 (Ivy Bridge) / Mobile Core i3-3000 (Ivy Bridge) / Mobile 
Core i5-3000 (Ivy Bridge) / Mobile Core i7-3000 (Ivy Bridge) / Xeon E3-1200 v2 
(Ivy Bridge) / Pentium G1600/G2000/G2100 (Ivy Bridge) / Pentium 
900/1000/2000/2100, 22nm");
+   FMQ (    0, 6,  3,10,     sX, "Intel Xeon E3-1100 v2 / E3-1200 v2 (Ivy 
Bridge), 22nm");
+   FMQ (    0, 6,  3,10,     dP, "Intel Pentium G1600/G2000/G2100 / Pentium 
B925C (Ivy Bridge), 22nm");
+   FM  (    0, 6,  3,10,         "Intel Core i3-3000 (Ivy Bridge) / i5-3000 
(Ivy Bridge) / i7-3000 (Ivy Bridge) / Mobile Core i3-3000 (Ivy Bridge) / Mobile 
Core i5-3000 (Ivy Bridge) / Mobile Core i7-3000 (Ivy Bridge) / Xeon E3-1100 v2 
/ E3-1200 v2 (Ivy Bridge) / Pentium G1600/G2000/G2100 (Ivy Bridge) / Pentium 
900/1000/2000/2100 / Pentium B925C, 22nm");
    // Intel docs (328899, 328903, 328908) omit the stepping numbers for 
(0,6),(3,12) C0 & D0.
    FMQ (    0, 6,  3,12,     sX, "Intel Xeon E3-1200 v3 (Haswell), 22nm");
    FMQ (    0, 6,  3,12,     Mc, "Intel Mobile Core i3-4000U / Mobile Core 
i5-4000U / Mobile Core i7-4000U (Mobile M) (Haswell), 22nm");
@@ -2216,13 +2225,14 @@
    FMQ (    0, 6,  4,15,     dc, "Intel Core i7-6800K / i7-6900K / i7-6900X 
(Broadwell-E), 14nm");
    FMQ (    0, 6,  4,15,     sX, "Intel Xeon E5-1600 / E5-2600 / E5-4600 v4 
(Broadwell) / E7-4800 / E7-8800 v4 (Broadwell-EX), 14nm");
    FM  (    0, 6,  4,15,         "Intel Core i7-6800K / i7-6900K / i7-6900X 
(Broadwell-E) / Xeon E5-1600 / E5-2500 / E5-4600 (Broadwell) / E7-4800 / 
E7-8800 v4 (Broadwell-EX), 14nm");
-   // So far, all these (0,6),(5,7) processors are stepping B0, but the
-   // Intel docs (334646) omit the stepping number for B0.
    FMS (    0, 6,  5, 6,  1,     "Intel Xeon D-1500 (Broadwell-DE U0), 14nm");
    FMS (    0, 6,  5, 6,  2,     "Intel Xeon D-1500 (Broadwell-DE V1), 14nm");
    FMS (    0, 6,  5, 6,  3,     "Intel Xeon D-1500 (Broadwell-DE V2), 14nm");
    FMS (    0, 6,  5, 6,  4,     "Intel Xeon D-1500 (Broadwell-DE Y0), 14nm");
    FM  (    0, 6,  5, 6,         "Intel Xeon D-1500 (Broadwell-DE), 14nm");
+   // Intel docs (334646) omit the stepping number for B0.  But as of Jan 2017,
+   // it is the only stepping, and all examples seen have stepping number 1.
+   FMS (    0, 6,  5, 7,  1,     "Intel Xeon Phi x200 (Knights Landing B0), 
14nm");
    FM  (    0, 6,  5, 7,         "Intel Xeon Phi x200 (Knights Landing), 
14nm");
    FM  (    0, 6,  5,10,         "Intel Atom Z3400 (Moorefield), 22nm"); // no 
spec update; only 325462 Volume 3 Table 35-1 so far
    // Intel docs (334820) omit the stepping numbers for B0 & B1.
@@ -2242,8 +2252,12 @@
    FM  (    0, 6,  8, 5,         "Intel Xeon Phi (Knights Mill), 14nm"); // no 
spec update; 325462 Volume 3 Table 35-1 is vague; Piotr Luc said it would be 
Knights Mill
    // So far, all these (0,6),(8,14) processors are stepping H0, but the
    // Intel docs (334663) omit the stepping number for H0.
-   FM  (    0, 6,  8,14,         "Intel m3-7Y00 / i5-7Y00 / i7-7Y00 / i3-7000U 
/ i5-7000U / i7-7000U (Kaby Lake), 14nm");
-   FM  (    0, 6,  9,14,         "Intel Core (Kaby Lake), 14nm"); // no spec 
update; only 325462 Volume 3 Table 35-1 so far
+   FMQ (    0, 6,  8,14,     dc, "Intel m3-7Y00 / i5-7Y00 / i7-7Y00 / i3-7000U 
/ i5-7000U / i7-7000U (Kaby Lake), 14nm");
+   FMQ (    0, 6,  8,14,     dP, "Intel Pentium 4410Y / 4415U (Kaby Lake), 
14nm");
+   FMQ (    0, 6,  8,14,     dC, "Intel Celeron 3965Y / 3865U / 3965U (Kaby 
Lake), 14nm");
+   FM  (    0, 6,  8,14,         "Intel m3-7Y00 / i5-7Y00 / i7-7Y00 / i3-7000U 
/ i5-7000U / i7-7000U / Pentium 4410Y / 4415U / Celeron 3965Y / 3865U / 3965U 
(Kaby Lake), 14nm");
+   FMQ (    0, 6,  9,14,     dc, "Intel Core i5-7000 / i5-7000K / i5-7000T / 
i7-7000 / E3-15x5MV6 / i3-7100H / i5-7000HQ / i7-7000HQ (Kaby Lake), 14nm");
+   FM  (    0, 6,  9,14,         "Intel Core i5-7000 / i5-7000K / i5-7000T / 
i7-7000 / E3-15x5MV6 / i3-7100H / i5-7000HQ / i7-7000HQ (Kaby Lake), 14nm");
    FQ  (    0, 6,            sX, "Intel Xeon (unknown model)");
    FQ  (    0, 6,            se, "Intel Xeon (unknown model)");
    FQ  (    0, 6,            MC, "Intel Mobile Celeron (unknown model)");
@@ -2817,147 +2831,157 @@
    FMS (0,15, 12, 1,  3,     "AMD Athlon 64 FX Dual-Core (Windsor JH-F3), 
90nm");
    FM  (0,15, 12, 1,         "AMD Athlon 64 FX Dual-Core (Windsor), 90nm");
    F   (0,15,                "AMD Opteron / Athlon 64 / Athlon 64 FX / Sempron 
/ Turion / Athlon Neo / Dual Core Opteron / Athlon 64 X2 / Athlon 64 FX / 
mobile Athlon 64 / mobile Sempron / mobile Athlon XP-M (DP) (unknown model)");
-   FMSQ(1,15,  0, 2,  1, dO, "AMD Quad-Core Opteron (Barcelona DR-B1), 65nm");
-   FMS (1,15,  0, 2,  1,     "AMD Quad-Core Opteron (Barcelona DR-B1), 65nm");
-   FMSQ(1,15,  0, 2,  2, EO, "AMD Embedded Opteron (Barcelona DR-B2), 65nm");
-   FMSQ(1,15,  0, 2,  2, dO, "AMD Quad-Core Opteron (Barcelona DR-B2), 65nm");
-   FMSQ(1,15,  0, 2,  2, Tp, "AMD Phenom Triple-Core (Toliman DR-B2), 65nm");
-   FMSQ(1,15,  0, 2,  2, Qp, "AMD Phenom Quad-Core (Agena DR-B2), 65nm");
-   FMS (1,15,  0, 2,  2,     "AMD Quad-Core Opteron (Barcelona DR-B2) / 
Embedded Opteron (Barcelona DR-B2) / Phenom Triple-Core (Toliman DR-B2) / 
Phenom Quad-Core (Agena DR-B2), 65nm");
-   FMQ (1,15,  0, 2,     EO, "AMD Embedded Opteron (Barcelona), 65nm");
-   FMQ (1,15,  0, 2,     dO, "AMD Quad-Core Opteron (Barcelona), 65nm");
-   FMQ (1,15,  0, 2,     Tp, "AMD Phenom Triple-Core (Toliman), 65nm");
-   FMQ (1,15,  0, 2,     Qp, "AMD Phenom Quad-Core (Agena), 65nm");
-   FM  (1,15,  0, 2,         "AMD Opteron (Barcelona) / Phenom Triple-Core 
(Toliman) / Phenom Quad-Core (Agena), 65nm");
-   FMSQ(1,15,  0, 2,  3, EO, "AMD Embedded Opteron (Barcelona DR-B3), 65nm");
-   FMSQ(1,15,  0, 2,  3, dO, "AMD Quad-Core Opteron (Barcelona DR-B3), 65nm");
-   FMSQ(1,15,  0, 2,  3, Tp, "AMD Phenom Triple-Core (Toliman DR-B3), 65nm");
-   FMSQ(1,15,  0, 2,  3, Qp, "AMD Phenom Quad-Core (Agena DR-B3), 65nm");
-   FMSQ(1,15,  0, 2,  3, dA, "AMD Athlon Dual-Core (Kuma DR-B3), 65nm");
-   FMS (1,15,  0, 2,  3,     "AMD Quad-Core Opteron (Barcelona DR-B3) / 
Embedded Opteron (Barcelona DR-B2) / Phenom Triple-Core (Toliman DR-B3) / 
Phenom Quad-Core (Agena DR-B3) / Athlon Dual-Core (Kuma DR-B3), 65nm");
-   FMS (1,15,  0, 2, 10,     "AMD Quad-Core Opteron (Barcelona DR-BA), 65nm");
-   FMQ (1,15,  0, 2,     EO, "AMD Embedded Opteron (Barcelona), 65nm");
-   FMQ (1,15,  0, 2,     dO, "AMD Quad-Core Opteron (Barcelona), 65nm");
-   FMQ (1,15,  0, 2,     Tp, "AMD Phenom Triple-Core (Toliman), 65nm");
-   FMQ (1,15,  0, 2,     Qp, "AMD Phenom Quad-Core (Agena), 65nm");
-   FMQ (1,15,  0, 2,     dA, "AMD Athlon Dual-Core (Kuma), 65nm");
-   FM  (1,15,  0, 2,         "AMD Quad-Core Opteron (Barcelona) / Phenom 
Triple-Core (Toliman) / Phenom Quad-Core (Agena) / Athlon Dual-Core (Kuma), 
65nm");
-   FMSQ(1,15,  0, 4,  2, EO, "AMD Embedded Opteron (Shanghai RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, dO, "AMD Quad-Core Opteron (Shanghai RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, dR, "AMD Athlon Dual-Core (Propus RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, dA, "AMD Athlon Dual-Core (Regor RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, Dp, "AMD Phenom II X2 (Callisto RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, Tp, "AMD Phenom II X3 (Heka RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  2, Qp, "AMD Phenom II X4 (Deneb RB-C2), 45nm");
-   FMS (1,15,  0, 4,  2,     "AMD Quad-Core Opteron (Shanghai RB-C2) / 
Embedded Opteron (Shanghai RB-C2) / Athlon Dual-Core (Regor / Propus RB-C2) / 
Phenom II (Callisto / Heka / Deneb RB-C2), 45nm");
-   FMSQ(1,15,  0, 4,  3, Dp, "AMD Phenom II X2 (Callisto RB-C3), 45nm");
-   FMSQ(1,15,  0, 4,  3, Tp, "AMD Phenom II X3 (Heka RB-C3), 45nm");
-   FMSQ(1,15,  0, 4,  3, Qp, "AMD Phenom II X4 (Deneb RB-C3), 45nm");
-   FMS (1,15,  0, 4,  3,     "AMD Phenom II (Callisto / Heka / Deneb RB-C3), 
45nm");
-   FMQ (1,15,  0, 4,     EO, "AMD Embedded Opteron (Shanghai), 45nm");
-   FMQ (1,15,  0, 4,     dO, "AMD Quad-Core Opteron (Shanghai), 45nm");
-   FMQ (1,15,  0, 4,     dR, "AMD Athlon Dual-Core (Propus), 45nm");
-   FMQ (1,15,  0, 4,     dA, "AMD Athlon Dual-Core (Regor), 45nm");
-   FMQ (1,15,  0, 4,     Dp, "AMD Phenom II X2 (Callisto), 45nm");
-   FMQ (1,15,  0, 4,     Tp, "AMD Phenom II X3 (Heka), 45nm");
-   FMQ (1,15,  0, 4,     Qp, "AMD Phenom II X4 (Deneb), 45nm");
-   FM  (1,15,  0, 4,         "AMD Quad-Core Opteron (Shanghai) / Athlon 
Dual-Core (Regor / Propus) / Phenom II (Callisto / Heka / Deneb), 45nm");
-   FMSQ(1,15,  0, 5,  2, DA, "AMD Athlon II X2 (Regor BL-C2), 45nm");
-   FMSQ(1,15,  0, 5,  2, TA, "AMD Athlon II X3 (Rana BL-C2), 45nm");
-   FMSQ(1,15,  0, 5,  2, QA, "AMD Athlon II X4 (Propus BL-C2), 45nm");
-   FMS (1,15,  0, 5,  2,     "AMD Athlon II X2 / X3 / X4 (Regor / Rana / 
Propus BL-C2), 45nm");
-   FMSQ(1,15,  0, 5,  3, TA, "AMD Athlon II X3 (Rana BL-C3), 45nm");
-   FMSQ(1,15,  0, 5,  3, QA, "AMD Athlon II X4 (Propus BL-C3), 45nm");
-   FMSQ(1,15,  0, 5,  3, Tp, "AMD Phenom II Triple-Core (Heka BL-C3), 45nm");
-   FMSQ(1,15,  0, 5,  3, Qp, "AMD Phenom II Quad-Core (Deneb BL-C3), 45nm");
-   FMS (1,15,  0, 5,  3,     "AMD Athlon II X3 / X4 (Rana / Propus BL-C3) / 
Phenom II Triple-Core (Heka BL-C3) / Quad-Core (Deneb BL-C3), 45nm");
-   FMQ (1,15,  0, 5,     DA, "AMD Athlon II X2 (Regor), 45nm");
-   FMQ (1,15,  0, 5,     TA, "AMD Athlon II X3 (Rana), 45nm");
-   FMQ (1,15,  0, 5,     QA, "AMD Athlon II X4 (Propus), 45nm");
-   FMQ (1,15,  0, 5,     Tp, "AMD Phenom II Triple-Core (Heka), 45nm");
-   FMQ (1,15,  0, 5,     Qp, "AMD Phenom II Quad-Core (Deneb), 45nm");
-   FM  (1,15,  0, 5,         "AMD Athlon II X2 / X3 / X4 (Regor / Rana / 
Propus) / Phenom II Triple-Core (Heka) / Quad-Core (Deneb), 45nm");
-   FMSQ(1,15,  0, 6,  2, MS, "AMD Sempron Mobile (Sargas DA-C2), 45nm");
-   FMSQ(1,15,  0, 6,  2, dS, "AMD Sempron II (Sargas DA-C2), 45nm");
-   FMSQ(1,15,  0, 6,  2, MT, "AMD Turion II Dual-Core Mobile (Caspian DA-C2), 
45nm");
-   FMSQ(1,15,  0, 6,  2, MA, "AMD Athlon II Dual-Core Mobile (Regor DA-C2), 
45nm");
-   FMSQ(1,15,  0, 6,  2, DA, "AMD Athlon II X2 (Regor DA-C2), 45nm");
-   FMSQ(1,15,  0, 6,  2, dA, "AMD Athlon II (Sargas DA-C2), 45nm");
-   FMS (1,15,  0, 6,  2,     "AMD Athlon II (Sargas DA-C2) / Athlon II X2 
(Regor DA-C2) / Sempron II (Sargas DA-C2) / Athlon II Dual-Core Mobile (Regor 
DA-C2) / Sempron Mobile (Sargas DA-C2) / Turion II Dual-Core Mobile (Caspian 
DA-C2), 45nm");
-   FMSQ(1,15,  0, 6,  3, Ms, "AMD V-Series Mobile (Champlain DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, DS, "AMD Sempron II X2 (Regor DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, dS, "AMD Sempron II (Sargas DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, MT, "AMD Turion II Dual-Core Mobile (Champlain 
DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, Mp, "AMD Phenom II Dual-Core Mobile (Champlain 
DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, MA, "AMD Athlon II Dual-Core Mobile (Champlain 
DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, DA, "AMD Athlon II X2 (Regor DA-C3), 45nm");
-   FMSQ(1,15,  0, 6,  3, dA, "AMD Athlon II (Sargas DA-C3), 45nm");
-   FMS (1,15,  0, 6,  3,     "AMD Athlon II (Sargas DA-C3) / Athlon II X2 
(Regor DA-C2) / Sempron II (Sargas DA-C2) / Sempron II X2 (Regor DA-C3) / 
V-Series Mobile (Champlain DA-C3) / Athlon II Dual-Core Mobile (Champlain 
DA-C3) / Turion II Dual-Core Mobile (Champlain DA-C3) / Phenom II Dual-Core 
Mobile (Champlain DA-C3), 45nm");
-   FMQ (1,15,  0, 6,     Ms, "AMD V-Series Mobile (Champlain), 45nm");
-   FMQ (1,15,  0, 6,     MS, "AMD Sempron Mobile (Sargas), 45nm");
-   FMQ (1,15,  0, 6,     DS, "AMD Sempron II X2 (Regor), 45nm");
-   FMQ (1,15,  0, 6,     dS, "AMD Sempron II (Sargas), 45nm");
-   FMQ (1,15,  0, 6,     MT, "AMD Turion II Dual-Core Mobile (Caspian / 
Champlain), 45nm");
-   FMQ (1,15,  0, 6,     Mp, "AMD Phenom II Dual-Core Mobile (Champlain), 
45nm");
-   FMQ (1,15,  0, 6,     MA, "AMD Athlon II Dual-Core Mobile (Regor / 
Champlain), 45nm");
-   FMQ (1,15,  0, 6,     DA, "AMD Athlon II X2 (Regor), 45nm");
-   FMQ (1,15,  0, 6,     dA, "AMD Athlon II (Sargas), 45nm");
-   FM  (1,15,  0, 6,         "AMD Athlon II (Sargas) / Athlon II X2 (Regor) / 
Sempron II (Sargas) / Sempron II X2 (Regor) / Sempron Mobile (Sargas) / 
V-Series Mobile (Champlain) / Athlon II Dual-Core Mobile (Regor / Champlain) / 
Turion II Dual-Core Mobile (Caspian / Champlain) / Phenom II Dual-Core Mobile 
(Champlain), 45nm");
-   FMSQ(1,15,  0, 8,  0, SO, "AMD Six-Core Opteron (Istanbul HY-D0), 45nm");
-   FMSQ(1,15,  0, 8,  0, dO, "AMD Opteron 4100 (Lisbon HY-D0), 45nm");
-   FMS (1,15,  0, 8,  0,     "AMD Opteron 4100 (Lisbon HY-D0) / Six-Core 
Opteron (Istanbul HY-D0), 45nm");
-   FMS (1,15,  0, 8,  1,     "AMD Opteron 4100 (Lisbon HY-D1), 45nm");
-   FMQ (1,15,  0, 8,     SO, "AMD Six-Core Opteron (Istanbul), 45nm");
-   FMQ (1,15,  0, 8,     dO, "AMD Opteron 4100 (Lisbon), 45nm");
-   FM  (1,15,  0, 8,         "AMD Opteron 4100 (Lisbon) / Six-Core Opteron 
(Istanbul), 45nm");
-   FMS (1,15,  0, 9,  1,     "AMD Opteron 6100 (Magny-Cours HY-D1), 45nm");
-   FM  (1,15,  0, 9,         "AMD Opteron 6100 (Magny-Cours), 45nm");
-   FMSQ(1,15,  0,10,  0, Qp, "AMD Phenom II X4 (Zosma PH-E0), 45nm");
-   FMSQ(1,15,  0,10,  0, Sp, "AMD Phenom II X6 (Thuban PH-E0), 45nm");
-   FMS (1,15,  0,10,  0,     "AMD Phenom II X4 / X6 (Zosma / Thuban PH-E0), 
45nm");
-   FMQ (1,15,  0,10,     Qp, "AMD Phenom II X4 (Zosma), 45nm");
-   FMQ (1,15,  0,10,     Sp, "AMD Phenom II X6 (Thuban), 45nm");
-   FM  (1,15,  0,10,         "AMD Phenom II X4 / X6 (Zosma / Thuban), 45nm");
-   F   (1,15,                "AMD Athlon / Athlon II / Athlon II Xn / Opteron 
/ Opteron 4100 / Opteron 6100 / Embedded Opteron / Phenom / Phenom II / Phenom 
II Xn / Sempron II / Sempron II Xn / Sempron Mobile / Turion II / V-Series 
Mobile");
-   FMSQ(2,15,  0, 3,  1, MT, "AMD Turion X2 Dual-Core Mobile (Lion LG-B1), 
65nm");
-   FMSQ(2,15,  0, 3,  1, DS, "AMD Sempron X2 Dual-Core (Sable LG-B1), 65nm");
-   FMSQ(2,15,  0, 3,  1, dS, "AMD Sempron (Sable LG-B1), 65nm");
-   FMSQ(2,15,  0, 3,  1, DA, "AMD Athlon X2 Dual-Core (Lion LG-B1), 65nm");
-   FMSQ(2,15,  0, 3,  1, dA, "AMD Athlon (Lion LG-B1), 65nm");
-   FMS (2,15,  0, 3,  1,     "AMD Turion X2 Dual-Core Mobile (Lion LG-B1) / 
Athlon (Lion LG-B1) / Athlon X2 Dual-Core (Lion LG-B1) / Sempron (Sable LG-B1) 
/ Sempron X2 Dual-Core (Sable LG-B1), 65nm");
-   FMQ (2,15,  0, 3,     MT, "AMD Turion X2 (Lion), 65nm");
-   FMQ (2,15,  0, 3,     DS, "AMD Sempron X2 Dual-Core (Sable), 65nm");
-   FMQ (2,15,  0, 3,     dS, "AMD Sempron (Sable), 65nm");
-   FMQ (2,15,  0, 3,     DA, "AMD Athlon X2 Dual-Core (Lion), 65nm");
-   FMQ (2,15,  0, 3,     dA, "AMD Athlon (Lion), 65nm");
-   FM  (2,15,  0, 3,         "AMD Turion X2 (Lion) / Athlon (Lion) / Sempron 
(Sable), 65nm");
-   F   (2,15,                "AMD Turion X2 Mobile / Athlon / Athlon X2 / 
Sempron / Sempron X2, 65nm");
-   FMSQ(3,15,  0, 1,  0, dS, "AMD Sempron Dual-Core (Llano LN-B0), 32nm");
-   FMSQ(3,15,  0, 1,  0, dA, "AMD Athlon II Dual-Core (Llano LN-B0), 32nm");
-   FMSQ(3,15,  0, 1,  0, Ms, "AMD A-Series (Llano LN-B0) / E2-Series (Llano 
LN-B0), 32nm");
-   FMS (3,15,  0, 1,  0,     "AMD Sempron Dual-Core (Llano LN-B0) / Athlon II 
Dual-Core (Llano LN-B0) / A-Series (Llano LN-B0) / E2-Series (Llano LN-B0), 
32nm");
-   FMQ (3,15,  0, 1,     dS, "AMD Sempron Dual-Core (Llano), 32nm");
-   FMQ (3,15,  0, 1,     dA, "AMD Athlon II Dual-Core (Llano), 32nm");
-   FMQ (3,15,  0, 1,     Ms, "AMD A-Series (Llano) / E2-Series (Llano), 32nm");
-   FM  (3,15,  0, 1,         "AMD Sempron Dual-Core (Llano) / Athlon II 
Dual-Core (Llano) / A-Series (Llano) / E2-Series (Llano), 32nm");
-   FMS (5,15,  0, 1,  0,     "AMD C-Series (Ontario ON-B0) / E-Series (Zacate 
ON-B0) / G-Series (Ontario/Zacate ON-B0) / Z-Series (Desna ON-B0), 40nm");
-   FM  (5,15,  0, 1,         "AMD C-Series (Ontario) / E-Series (Zacate) / 
G-Series (Ontario/Zacat) / Z-Series (Desna), 40nm");
-   FMS (5,15,  0, 2,  0,     "AMD C-Series (Ontario ON-C0) / E-Series (Zacate 
ON-C0) / G-Series (Ontario/Zacate ON-C0) / Z-Series (Desna ON-C0), 40nm");
-   FM  (5,15,  0, 2,         "AMD C-Series (Ontario) / E-Series (Zacate) / 
G-Series (Ontario/Zacat) / Z-Series (Desna), 40nm");
-   F   (5,15,                "AMD C-Series / E-Series / G-Series / Z-Series, 
40nm");
-   FMSQ(6,15,  0, 1,  2, dO, "AMD Opteron 6200 (Interlagos OR-B2) / Opteron 
4200 (Valencia OR-B2) / Opteron 3200 (Zurich OR-B2), 32nm");
-   FMSQ(6,15,  0, 1,  2, df, "AMD FX-Series (Zambezi OR-B2), 32nm");
-   FMS (6,15,  0, 1,  2,     "AMD Opteron 6200 (Interlagos OR-B2) / Opteron 
4200 (Valencia OR-B2) / Opteron 3200 (Zurich OR-B2) / AMD FX-Series (Zambezi 
OR-B2), 32nm");
-   FMQ (6,15,  0, 1,     dO, "AMD Opteron 6200 (Interlagos) / Opteron 4200 
(Valencia) / Opteron 3200 (Zurich), 32nm");
-   FM  (6,15,  0, 1,         "AMD Opteron 6200 (Interlagos) / Opteron 4200 
(Valencia) / Opteron 3200 (Zurich) / AMD FX-Series (Zambezi), 32nm");
-   FMS (6,15,  0, 2,  0,     "AMD Opteron 6300 (Abu Dhabi OR-C0) / Opteron 
4300 (Seoul OR-C0) / Opteron 3300 (Delhi OR-C0), 32nm");
-   FMS (6,15,  1, 0,  1,     "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Trinity TN-A1), 32nm");
-   FM  (6,15,  1, 0,         "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Trinity), 32nm");
-   FMS (6,15,  1, 3,  1,     "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Richland RL-A1), 32nm");
-   FM  (6,15,  1, 3,         "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Richland), 32nm");
-   F   (6,15,                "AMD Opteron 6x00 / Opteron 4x00 / Opteron 3x00 / 
AMD FX-Series / A-Series / AMD R-Series / Athlon Dual-Core / Athlon Quad-Core / 
Sempron Dual-Core / FirePro, 32nm");
-   FMS (7,15,  0, 0,  1,     "AMD A-Series / E-Series / G-Series / Opteron 
X1100 Series / Opteron X2100 Series (Steamroller KB-A1), 28nm");
-   FM  (7,15,  0, 0,         "AMD A-Series / E-Series / G-Series / Opteron 
X1100 Series / Opteron X2100 Series (Steamroller), 28nm");
+   FMSQ(1,15,  0, 2,  1, dO, "AMD Quad-Core Opteron (Barcelona DR-B1) [K10], 
65nm");
+   FMS (1,15,  0, 2,  1,     "AMD Quad-Core Opteron (Barcelona DR-B1) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  2, EO, "AMD Embedded Opteron (Barcelona DR-B2) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  2, dO, "AMD Quad-Core Opteron (Barcelona DR-B2) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  2, Tp, "AMD Phenom Triple-Core (Toliman DR-B2) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  2, Qp, "AMD Phenom Quad-Core (Agena DR-B2) [K10], 65nm");
+   FMS (1,15,  0, 2,  2,     "AMD Quad-Core Opteron (Barcelona DR-B2) / 
Embedded Opteron (Barcelona DR-B2) / Phenom Triple-Core (Toliman DR-B2) / 
Phenom Quad-Core (Agena DR-B2) [K10], 65nm");
+   FMQ (1,15,  0, 2,     EO, "AMD Embedded Opteron (Barcelona) [K10], 65nm");
+   FMQ (1,15,  0, 2,     dO, "AMD Quad-Core Opteron (Barcelona) [K10], 65nm");
+   FMQ (1,15,  0, 2,     Tp, "AMD Phenom Triple-Core (Toliman) [K10], 65nm");
+   FMQ (1,15,  0, 2,     Qp, "AMD Phenom Quad-Core (Agena) [K10], 65nm");
+   FM  (1,15,  0, 2,         "AMD Opteron (Barcelona) / Phenom Triple-Core 
(Toliman) / Phenom Quad-Core (Agena) [K10], 65nm");
+   FMSQ(1,15,  0, 2,  3, EO, "AMD Embedded Opteron (Barcelona DR-B3) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  3, dO, "AMD Quad-Core Opteron (Barcelona DR-B3) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  3, Tp, "AMD Phenom Triple-Core (Toliman DR-B3) [K10], 
65nm");
+   FMSQ(1,15,  0, 2,  3, Qp, "AMD Phenom Quad-Core (Agena DR-B3) [K10], 65nm");
+   FMSQ(1,15,  0, 2,  3, dA, "AMD Athlon Dual-Core (Kuma DR-B3) [K10], 65nm");
+   FMS (1,15,  0, 2,  3,     "AMD Quad-Core Opteron (Barcelona DR-B3) / 
Embedded Opteron (Barcelona DR-B2) / Phenom Triple-Core (Toliman DR-B3) / 
Phenom Quad-Core (Agena DR-B3) / Athlon Dual-Core (Kuma DR-B3) [K10], 65nm");
+   FMS (1,15,  0, 2, 10,     "AMD Quad-Core Opteron (Barcelona DR-BA) [K10], 
65nm");
+   FMQ (1,15,  0, 2,     EO, "AMD Embedded Opteron (Barcelona) [K10], 65nm");
+   FMQ (1,15,  0, 2,     dO, "AMD Quad-Core Opteron (Barcelona) [K10], 65nm");
+   FMQ (1,15,  0, 2,     Tp, "AMD Phenom Triple-Core (Toliman) [K10], 65nm");
+   FMQ (1,15,  0, 2,     Qp, "AMD Phenom Quad-Core (Agena) [K10], 65nm");
+   FMQ (1,15,  0, 2,     dA, "AMD Athlon Dual-Core (Kuma) [K10], 65nm");
+   FM  (1,15,  0, 2,         "AMD Quad-Core Opteron (Barcelona) / Phenom 
Triple-Core (Toliman) / Phenom Quad-Core (Agena) / Athlon Dual-Core (Kuma) 
[K10], 65nm");
+   FMSQ(1,15,  0, 4,  2, EO, "AMD Embedded Opteron (Shanghai RB-C2) [K10], 
45nm");
+   FMSQ(1,15,  0, 4,  2, dO, "AMD Quad-Core Opteron (Shanghai RB-C2) [K10], 
45nm");
+   FMSQ(1,15,  0, 4,  2, dR, "AMD Athlon Dual-Core (Propus RB-C2) [K10], 
45nm");
+   FMSQ(1,15,  0, 4,  2, dA, "AMD Athlon Dual-Core (Regor RB-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  2, Dp, "AMD Phenom II X2 (Callisto RB-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  2, Tp, "AMD Phenom II X3 (Heka RB-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  2, Qp, "AMD Phenom II X4 (Deneb RB-C2) [K10], 45nm");
+   FMS (1,15,  0, 4,  2,     "AMD Quad-Core Opteron (Shanghai RB-C2) / 
Embedded Opteron (Shanghai RB-C2) / Athlon Dual-Core (Regor / Propus RB-C2) / 
Phenom II (Callisto / Heka / Deneb RB-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  3, Dp, "AMD Phenom II X2 (Callisto RB-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  3, Tp, "AMD Phenom II X3 (Heka RB-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 4,  3, Qp, "AMD Phenom II X4 (Deneb RB-C3) [K10], 45nm");
+   FMS (1,15,  0, 4,  3,     "AMD Phenom II (Callisto / Heka / Deneb RB-C3) 
[K10], 45nm");
+   FMQ (1,15,  0, 4,     EO, "AMD Embedded Opteron (Shanghai) [K10], 45nm");
+   FMQ (1,15,  0, 4,     dO, "AMD Quad-Core Opteron (Shanghai) [K10], 45nm");
+   FMQ (1,15,  0, 4,     dR, "AMD Athlon Dual-Core (Propus) [K10], 45nm");
+   FMQ (1,15,  0, 4,     dA, "AMD Athlon Dual-Core (Regor) [K10], 45nm");
+   FMQ (1,15,  0, 4,     Dp, "AMD Phenom II X2 (Callisto) [K10], 45nm");
+   FMQ (1,15,  0, 4,     Tp, "AMD Phenom II X3 (Heka) [K10], 45nm");
+   FMQ (1,15,  0, 4,     Qp, "AMD Phenom II X4 (Deneb) [K10], 45nm");
+   FM  (1,15,  0, 4,         "AMD Quad-Core Opteron (Shanghai) / Athlon 
Dual-Core (Regor / Propus) / Phenom II (Callisto / Heka / Deneb) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  2, DA, "AMD Athlon II X2 (Regor BL-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  2, TA, "AMD Athlon II X3 (Rana BL-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  2, QA, "AMD Athlon II X4 (Propus BL-C2) [K10], 45nm");
+   FMS (1,15,  0, 5,  2,     "AMD Athlon II X2 / X3 / X4 (Regor / Rana / 
Propus BL-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  3, TA, "AMD Athlon II X3 (Rana BL-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  3, QA, "AMD Athlon II X4 (Propus BL-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 5,  3, Tp, "AMD Phenom II Triple-Core (Heka BL-C3) [K10], 
45nm");
+   FMSQ(1,15,  0, 5,  3, Qp, "AMD Phenom II Quad-Core (Deneb BL-C3) [K10], 
45nm");
+   FMS (1,15,  0, 5,  3,     "AMD Athlon II X3 / X4 (Rana / Propus BL-C3) / 
Phenom II Triple-Core (Heka BL-C3) / Quad-Core (Deneb BL-C3) [K10], 45nm");
+   FMQ (1,15,  0, 5,     DA, "AMD Athlon II X2 (Regor) [K10], 45nm");
+   FMQ (1,15,  0, 5,     TA, "AMD Athlon II X3 (Rana) [K10], 45nm");
+   FMQ (1,15,  0, 5,     QA, "AMD Athlon II X4 (Propus) [K10], 45nm");
+   FMQ (1,15,  0, 5,     Tp, "AMD Phenom II Triple-Core (Heka) [K10], 45nm");
+   FMQ (1,15,  0, 5,     Qp, "AMD Phenom II Quad-Core (Deneb) [K10], 45nm");
+   FM  (1,15,  0, 5,         "AMD Athlon II X2 / X3 / X4 (Regor / Rana / 
Propus) / Phenom II Triple-Core (Heka) / Quad-Core (Deneb) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, MS, "AMD Sempron Mobile (Sargas DA-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, dS, "AMD Sempron II (Sargas DA-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, MT, "AMD Turion II Dual-Core Mobile (Caspian DA-C2) 
[K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, MA, "AMD Athlon II Dual-Core Mobile (Regor DA-C2) 
[K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, DA, "AMD Athlon II X2 (Regor DA-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  2, dA, "AMD Athlon II (Sargas DA-C2) [K10], 45nm");
+   FMS (1,15,  0, 6,  2,     "AMD Athlon II (Sargas DA-C2) / Athlon II X2 
(Regor DA-C2) / Sempron II (Sargas DA-C2) / Athlon II Dual-Core Mobile (Regor 
DA-C2) / Sempron Mobile (Sargas DA-C2) / Turion II Dual-Core Mobile (Caspian 
DA-C2) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, Ms, "AMD V-Series Mobile (Champlain DA-C3) [K10], 
45nm");
+   FMSQ(1,15,  0, 6,  3, DS, "AMD Sempron II X2 (Regor DA-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, dS, "AMD Sempron II (Sargas DA-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, MT, "AMD Turion II Dual-Core Mobile (Champlain DA-C3) 
[K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, Mp, "AMD Phenom II Dual-Core Mobile (Champlain DA-C3) 
[K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, MA, "AMD Athlon II Dual-Core Mobile (Champlain DA-C3) 
[K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, DA, "AMD Athlon II X2 (Regor DA-C3) [K10], 45nm");
+   FMSQ(1,15,  0, 6,  3, dA, "AMD Athlon II (Sargas DA-C3) [K10], 45nm");
+   FMS (1,15,  0, 6,  3,     "AMD Athlon II (Sargas DA-C3) / Athlon II X2 
(Regor DA-C2) / Sempron II (Sargas DA-C2) / Sempron II X2 (Regor DA-C3) / 
V-Series Mobile (Champlain DA-C3) / Athlon II Dual-Core Mobile (Champlain 
DA-C3) / Turion II Dual-Core Mobile (Champlain DA-C3) / Phenom II Dual-Core 
Mobile (Champlain DA-C3) [K10], 45nm");
+   FMQ (1,15,  0, 6,     Ms, "AMD V-Series Mobile (Champlain) [K10], 45nm");
+   FMQ (1,15,  0, 6,     MS, "AMD Sempron Mobile (Sargas) [K10], 45nm");
+   FMQ (1,15,  0, 6,     DS, "AMD Sempron II X2 (Regor) [K10], 45nm");
+   FMQ (1,15,  0, 6,     dS, "AMD Sempron II (Sargas) [K10], 45nm");
+   FMQ (1,15,  0, 6,     MT, "AMD Turion II Dual-Core Mobile (Caspian / 
Champlain) [K10], 45nm");
+   FMQ (1,15,  0, 6,     Mp, "AMD Phenom II Dual-Core Mobile (Champlain) 
[K10], 45nm");
+   FMQ (1,15,  0, 6,     MA, "AMD Athlon II Dual-Core Mobile (Regor / 
Champlain) [K10], 45nm");
+   FMQ (1,15,  0, 6,     DA, "AMD Athlon II X2 (Regor) [K10], 45nm");
+   FMQ (1,15,  0, 6,     dA, "AMD Athlon II (Sargas) [K10], 45nm");
+   FM  (1,15,  0, 6,         "AMD Athlon II (Sargas) / Athlon II X2 (Regor) / 
Sempron II (Sargas) / Sempron II X2 (Regor) / Sempron Mobile (Sargas) / 
V-Series Mobile (Champlain) / Athlon II Dual-Core Mobile (Regor / Champlain) / 
Turion II Dual-Core Mobile (Caspian / Champlain) / Phenom II Dual-Core Mobile 
(Champlain) [K10], 45nm");
+   FMSQ(1,15,  0, 8,  0, SO, "AMD Six-Core Opteron (Istanbul HY-D0) [K10], 
45nm");
+   FMSQ(1,15,  0, 8,  0, dO, "AMD Opteron 4100 (Lisbon HY-D0) [K10], 45nm");
+   FMS (1,15,  0, 8,  0,     "AMD Opteron 4100 (Lisbon HY-D0) / Six-Core 
Opteron (Istanbul HY-D0) [K10], 45nm");
+   FMS (1,15,  0, 8,  1,     "AMD Opteron 4100 (Lisbon HY-D1) [K10], 45nm");
+   FMQ (1,15,  0, 8,     SO, "AMD Six-Core Opteron (Istanbul) [K10], 45nm");
+   FMQ (1,15,  0, 8,     dO, "AMD Opteron 4100 (Lisbon) [K10], 45nm");
+   FM  (1,15,  0, 8,         "AMD Opteron 4100 (Lisbon) / Six-Core Opteron 
(Istanbul) [K10], 45nm");
+   FMS (1,15,  0, 9,  1,     "AMD Opteron 6100 (Magny-Cours HY-D1) [K10], 
45nm");
+   FM  (1,15,  0, 9,         "AMD Opteron 6100 (Magny-Cours) [K10], 45nm");
+   FMSQ(1,15,  0,10,  0, Qp, "AMD Phenom II X4 (Zosma PH-E0) [K10], 45nm");
+   FMSQ(1,15,  0,10,  0, Sp, "AMD Phenom II X6 (Thuban PH-E0) [K10], 45nm");
+   FMS (1,15,  0,10,  0,     "AMD Phenom II X4 / X6 (Zosma / Thuban PH-E0) 
[K10], 45nm");
+   FMQ (1,15,  0,10,     Qp, "AMD Phenom II X4 (Zosma) [K10], 45nm");
+   FMQ (1,15,  0,10,     Sp, "AMD Phenom II X6 (Thuban) [K10], 45nm");
+   FM  (1,15,  0,10,         "AMD Phenom II X4 / X6 (Zosma / Thuban) [K10], 
45nm");
+   F   (1,15,                "AMD Athlon / Athlon II / Athlon II Xn / Opteron 
/ Opteron 4100 / Opteron 6100 / Embedded Opteron / Phenom / Phenom II / Phenom 
II Xn / Sempron II / Sempron II Xn / Sempron Mobile / Turion II / V-Series 
Mobile [K10]");
+   FMSQ(2,15,  0, 3,  1, MT, "AMD Turion X2 Dual-Core Mobile (Lion LG-B1) 
[Puma 2008], 65nm");
+   FMSQ(2,15,  0, 3,  1, DS, "AMD Sempron X2 Dual-Core (Sable LG-B1) [Puma 
2008], 65nm");
+   FMSQ(2,15,  0, 3,  1, dS, "AMD Sempron (Sable LG-B1) [Puma 2008], 65nm");
+   FMSQ(2,15,  0, 3,  1, DA, "AMD Athlon X2 Dual-Core (Lion LG-B1) [Puma 
2008], 65nm");
+   FMSQ(2,15,  0, 3,  1, dA, "AMD Athlon (Lion LG-B1) [Puma 2008], 65nm");
+   FMS (2,15,  0, 3,  1,     "AMD Turion X2 Dual-Core Mobile (Lion LG-B1) / 
Athlon (Lion LG-B1) / Athlon X2 Dual-Core (Lion LG-B1) / Sempron (Sable LG-B1) 
/ Sempron X2 Dual-Core (Sable LG-B1) [Puma 2008], 65nm");
+   FMQ (2,15,  0, 3,     MT, "AMD Turion X2 (Lion) [Puma 2008], 65nm");
+   FMQ (2,15,  0, 3,     DS, "AMD Sempron X2 Dual-Core (Sable) [Puma 2008], 
65nm");
+   FMQ (2,15,  0, 3,     dS, "AMD Sempron (Sable) [Puma 2008], 65nm");
+   FMQ (2,15,  0, 3,     DA, "AMD Athlon X2 Dual-Core (Lion) [Puma 2008], 
65nm");
+   FMQ (2,15,  0, 3,     dA, "AMD Athlon (Lion) [Puma 2008], 65nm");
+   FM  (2,15,  0, 3,         "AMD Turion X2 (Lion) / Athlon (Lion) / Sempron 
(Sable) [Puma 2008], 65nm");
+   F   (2,15,                "AMD Turion X2 Mobile / Athlon / Athlon X2 / 
Sempron / Sempron X2 [Puma 2008], 65nm");
+   FMSQ(3,15,  0, 1,  0, dS, "AMD Sempron Dual-Core (Llano LN-B0) [K10], 
32nm");
+   FMSQ(3,15,  0, 1,  0, dA, "AMD Athlon II Dual-Core (Llano LN-B0) [K10], 
32nm");
+   FMSQ(3,15,  0, 1,  0, Ms, "AMD A-Series (Llano LN-B0) / E2-Series (Llano 
LN-B0) [K10], 32nm");
+   FMS (3,15,  0, 1,  0,     "AMD Sempron Dual-Core (Llano LN-B0) / Athlon II 
Dual-Core (Llano LN-B0) / A-Series (Llano LN-B0) / E2-Series (Llano LN-B0) 
[K10], 32nm");
+   FMQ (3,15,  0, 1,     dS, "AMD Sempron Dual-Core (Llano) [K10], 32nm");
+   FMQ (3,15,  0, 1,     dA, "AMD Athlon II Dual-Core (Llano) [K10], 32nm");
+   FMQ (3,15,  0, 1,     Ms, "AMD A-Series (Llano) / E2-Series (Llano) [K10], 
32nm");
+   FM  (3,15,  0, 1,         "AMD Sempron Dual-Core (Llano) / Athlon II 
Dual-Core (Llano) / A-Series (Llano) / E2-Series (Llano) [K10], 32nm");
+   FMS (5,15,  0, 1,  0,     "AMD C-Series (Ontario ON-B0) / E-Series (Zacate 
ON-B0) / G-Series (Ontario/Zacate ON-B0) / Z-Series (Desna ON-B0) [Bobcat], 
40nm");
+   FM  (5,15,  0, 1,         "AMD C-Series (Ontario) / E-Series (Zacate) / 
G-Series (Ontario/Zacat) / Z-Series (Desna) [Bobcat], 40nm");
+   FMS (5,15,  0, 2,  0,     "AMD C-Series (Ontario ON-C0) / E-Series (Zacate 
ON-C0) / G-Series (Ontario/Zacate ON-C0) / Z-Series (Desna ON-C0) [Bobcat], 
40nm");
+   FM  (5,15,  0, 2,         "AMD C-Series (Ontario) / E-Series (Zacate) / 
G-Series (Ontario/Zacat) / Z-Series (Desna) [Bobcat], 40nm");
+   F   (5,15,                "AMD C-Series / E-Series / G-Series / Z-Series 
[Bobcat], 40nm");
+   FMSQ(6,15,  0, 1,  2, dO, "AMD Opteron 6200 (Interlagos OR-B2) / Opteron 
4200 (Valencia OR-B2) / Opteron 3200 (Zurich OR-B2) [Bulldozer], 32nm");
+   FMSQ(6,15,  0, 1,  2, df, "AMD FX-Series (Zambezi OR-B2) [Bulldozer], 
32nm");
+   FMS (6,15,  0, 1,  2,     "AMD Opteron 6200 (Interlagos OR-B2) / Opteron 
4200 (Valencia OR-B2) / Opteron 3200 (Zurich OR-B2) / AMD FX-Series (Zambezi 
OR-B2) [Bulldozer], 32nm");
+   FMQ (6,15,  0, 1,     dO, "AMD Opteron 6200 (Interlagos) / Opteron 4200 
(Valencia) / Opteron 3200 (Zurich) [Bulldozer], 32nm");
+   FM  (6,15,  0, 1,         "AMD Opteron 6200 (Interlagos) / Opteron 4200 
(Valencia) / Opteron 3200 (Zurich) / AMD FX-Series (Zambezi) [Bulldozer], 
32nm");
+   FMSQ(6,15,  0, 2,  0, dO, "AMD Opteron 6300 (Abu Dhabi OR-C0) / Opteron 
4300 (Seoul OR-C0) / Opteron 3300 (Delhi OR-C0) [Piledriver], 32nm");
+   FMSQ(6,15,  0, 2,  0, df, "AMD FX-Series (Vishera OR-C0) [Piledriver], 
32nm");
+   FMS (6,15,  0, 2,  0,     "AMD Opteron 6300 (Abu Dhabi OR-C0) / Opteron 
4300 (Seoul OR-C0) / Opteron 3300 (Delhi OR-C0) / FX-Series (Vishera OR-C0) 
[Piledriver], 32nm");
+   FMS (6,15,  1, 0,  1,     "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Trinity TN-A1) [Piledriver], 
32nm");
+   FM  (6,15,  1, 0,         "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Trinity) [Piledriver], 32nm");
+   FMS (6,15,  1, 3,  1,     "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Richland RL-A1) [Piledriver], 
32nm");
+   FM  (6,15,  1, 3,         "AMD A-Series / AMD R-Series / Athlon Dual-Core / 
Athlon Quad-Core / Sempron Dual-Core / FirePro (Richland) [Piledriver], 32nm");
+   FMS (6,15,  3, 0,  1,     "AMD Elite Performance A-Series / AMD Mobile 
R-Series / Opteron X1200 / X2200 (Kaveri KV-A1) [Steamroller], 28nm");
+   FM  (6,15,  3, 0,         "AMD Elite Performance A-Series / AMD Mobile 
R-Series / Opteron X1200 / X2200 (Kaveri) [Steamroller], 28nm");
+   FMS (6,15,  7, 0,  0,     "AMD A-Series / E-Series / G-Series (Stoney Ridge 
ST-A0) [Excavator], 28nm");
+   FM  (6,15,  7, 0,         "AMD A-Series / E-Series / G-Series (Stoney 
Ridge) [Excavator], 28nm");
+   F   (6,15,                "AMD Opteron 6x00 / Opteron 4x00 / Opteron 3x00 / 
AMD FX-Series / A-Series / E-Series / G-Series / R-Series / Opteron X1200 / 
X2200 / Athlon Dual-Core / Athlon Quad-Core / Sempron Dual-Core / FirePro");
+   FMS (7,15,  0, 0,  1,     "AMD A-Series / E-Series / G-Series / Opteron 
X1100 Series / Opteron X2100 Series (Kabini KB-A1) [Jaguar], 28nm");
+   FM  (7,15,  0, 0,         "AMD A-Series / E-Series / G-Series / Opteron 
X1100 Series / Opteron X2100 Series [Jaguar], 28nm");
+   // The AMD docs (53072) omit the CPUID entirely.  But if this sticks to the
+   // recent AMD pattern, these must be (7,15),(3,0).
+   FMS (7,15,  3, 0,  1,     "AMD A-Series / E-Series Series (Mullins ML-A1) 
[Puma 2014], 28nm");
+   FM  (7,15,  3, 0,         "AMD A-Series / E-Series Series (Mullins) [Puma 
2014], 28nm");
    DEFAULT                  ("unknown");
 
    const char*  brand_pre;
@@ -6582,6 +6606,13 @@
                      boolean       quiet)
 {
    if (cpuid_fd == USE_INSTRUCTION) {
+#ifdef USE_CPUID_COUNT
+      __cpuid_count(reg, ecx,
+                    words[WORD_EAX],
+                    words[WORD_EBX],
+                    words[WORD_ECX],
+                    words[WORD_EDX]);
+#else
       asm("cpuid"
           : "=a" (words[WORD_EAX]),
             "=b" (words[WORD_EBX]),
@@ -6589,6 +6620,7 @@
             "=d" (words[WORD_EDX])
           : "a" (reg), 
             "c" (ecx));
+#endif
    } else {
       off64_t  result;
       off64_t  offset = ((off64_t)ecx << 32) + reg;
@@ -7021,7 +7053,6 @@
    while (!feof(file)) {
       char          buffer[88];
       char*         ptr;
-      unsigned int  len;
       int           status;
       unsigned int  reg;
       unsigned int  try;
@@ -7039,8 +7070,6 @@
          exit(1);
       }
 
-      len = strlen(buffer);
-
       status = sscanf(ptr, "CPU %u:\r", &cpu);
       if (status == 1 || strcmp(ptr, "CPU:\n") == SAME) {
          if (seen_cpu) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/cpuid.man new/cpuid-20170122/cpuid.man
--- old/cpuid-20161201/cpuid.man        2016-12-01 15:18:57.000000000 +0100
+++ new/cpuid-20170122/cpuid.man        2017-01-22 21:55:39.000000000 +0100
@@ -1,7 +1,7 @@
 .\"
-.\" $Id: cpuid.man,v 20161201 2016/12/01 07:18:37 todd $
+.\" $Id: cpuid.man,v 20170122 2017/01/22 13:55:29 todd $
 .\"
-.TH CPUID 1 "1 Dec 2016" "201601201"
+.TH CPUID 1 "22 Jan 2017" "20170122"
 .SH NAME 
 cpuid \- Dump CPUID information for each CPU
 .SH SYNOPSIS
@@ -366,6 +366,11 @@
 .br
 326774: Intel Xeon Processor E3-1200 v2 Product Family Specification Update
 .br
+327335: Intel Xeon and Intel Core Processors For Communications Infrastructure
+Specification Update
+.br
+328105: Intel Atom Processor Z2760 Specification Update
+.br
 328198: Intel Atom Processor S1200 Product Family for Microserver
 Specification Update
 .br
@@ -377,10 +382,15 @@
 .br
 328908: Intel Xeon Processor E3-1200 v3 Product Family Specification Update
 .br
+329376: Intel Xeon E3-1125C v2, E3-1105C v2, Intel Core 3115C and
+Intel Pentium Processor B925C Specification Update
+.br
 329460: Intel Atom Processor C2000 Product Family Specification Update
 .br
 329597: Intel Xeon Processor E7 v2 Product Family Specification Update
 .br
+329676: Intel Quark SoC X1000 Datasheet
+.br
 330785: Intel Xeon Processor E5 v3 Product Family Specification Update
 .br
 330836: 5th Generation Intel Core Processor Family,
@@ -475,7 +485,13 @@
 .br
 48931: Revision Guide for AMD Family 15h Models 10h-1Fh Processors
 .br
+51603: Revision Guide for AMD Family 15h Models 30h-3Fh Processors
+.br
 51810: Revision Guide for AMD Family 16h Models 00h-0Fh Processors
+.br
+53072: Revision Guide for AMD Family 16h Models 30h-3Fh Processors
+.br
+55370: Revision Guide for AMD Family 15h Models 70h-7Fh Processors
 .RE
 
 Information on the CPUID instruction and on specific CPUs is available
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpuid-20161201/cpuid.spec 
new/cpuid-20170122/cpuid.spec
--- old/cpuid-20161201/cpuid.spec       2016-12-01 15:19:15.000000000 +0100
+++ new/cpuid-20170122/cpuid.spec       2017-01-22 21:56:47.000000000 +0100
@@ -1,4 +1,4 @@
-%define version 20161201
+%define version 20170122
 %define release 1
 Summary: dumps CPUID information about the CPU(s)
 Name: cpuid


Reply via email to