diff options
author | Torbjorn Granlund <tege@gmplib.org> | 2011-12-05 01:26:15 +0100 |
---|---|---|
committer | Torbjorn Granlund <tege@gmplib.org> | 2011-12-05 01:26:15 +0100 |
commit | ec47d215a803a41e9ae9970129f7f8775a24a43b (patch) | |
tree | 73b6ed6bb7337c024faa257e331bf98d2f894860 | |
parent | bc0e8f0cb868d81feb83188ddc0939cc85964299 (diff) | |
download | gmp-ec47d215a803a41e9ae9970129f7f8775a24a43b.tar.gz |
(MAKE_FMS): Fix typo in last change.
-rw-r--r-- | mpn/x86/fat/fat.c | 3 | ||||
-rw-r--r-- | mpn/x86_64/fat/fat.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mpn/x86/fat/fat.c b/mpn/x86/fat/fat.c index 63304039e..8349afcb3 100644 --- a/mpn/x86/fat/fat.c +++ b/mpn/x86/fat/fat.c @@ -40,7 +40,6 @@ long __gmpn_cpuid __GMP_PROTO ((char dst[12], int id)); int __gmpn_cpuid_available __GMP_PROTO ((void)); - #if WANT_FAKE_CPUID /* The "name"s in the table are values for the GMP_CPU_TYPE environment variable. Anything can be used, but for now it's the canonical cpu types @@ -50,7 +49,7 @@ int __gmpn_cpuid_available __GMP_PROTO ((void)); #define __gmpn_cpuid_available fake_cpuid_available #define MAKE_FMS(family, model) \ - ((((family) & 0xf) << 8) + (((family) & 0xff0) << 16) \ + ((((family) & 0xf) << 8) + (((family) & 0xff0) << 20) \ + (((model) & 0xf) << 4) + (((model) & 0xf0) << 12)) static struct { diff --git a/mpn/x86_64/fat/fat.c b/mpn/x86_64/fat/fat.c index c8c6bbdff..892ab6de2 100644 --- a/mpn/x86_64/fat/fat.c +++ b/mpn/x86_64/fat/fat.c @@ -41,6 +41,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ /* fat_entry.asm */ long __gmpn_cpuid __GMP_PROTO ((char dst[12], int id)); + #if WANT_FAKE_CPUID /* The "name"s in the table are values for the GMP_CPU_TYPE environment variable. Anything can be used, but for now it's the canonical cpu types @@ -50,7 +51,7 @@ long __gmpn_cpuid __GMP_PROTO ((char dst[12], int id)); #define __gmpn_cpuid_available fake_cpuid_available #define MAKE_FMS(family, model) \ - ((((family) & 0xf) << 8) + (((family) & 0xff0) << 16) \ + ((((family) & 0xf) << 8) + (((family) & 0xff0) << 20) \ + (((model) & 0xf) << 4) + (((model) & 0xf0) << 12)) static struct { |