[newlib-cygwin] fhandler_proc.cc(format_proc_cpuinfo): or model extension bits

[Ken Brown]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2160c52a49c80c0c7fe86a47476a1815d20c2c03

commit 2160c52a49c80c0c7fe86a47476a1815d20c2c03
Author: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca>
Date:   Mon Oct 7 10:23:07 2019 -0600

    fhandler_proc.cc(format_proc_cpuinfo): or model extension bits
    
    or model extension bits into model high bits instead of adding
    arithmetically like family extension.

Diff:
---
 winsup/cygwin/fhandler_proc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
index c924cf2..8c331f5 100644
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler_proc.cc
@@ -740,7 +740,7 @@ format_proc_cpuinfo (void *, char *&destbuf)
       if (family == 15)
 	family += (cpuid_sig >> 20) & 0xff;
       if (family >= 6)
-	model += ((cpuid_sig >> 16) & 0x0f) << 4;
+	model |= ((cpuid_sig >> 16) & 0x0f) << 4; /* ext model << 4 | model */
 
       uint32_t maxe = 0;
       cpuid (&maxe, &unused, &unused, &unused, 0x80000000);