aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2018-05-31 22:04:22 +0000
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2018-05-31 22:04:22 +0000
commita7550b5cca2430e7b0cb366be0bb4d938b6d90ef (patch)
tree3b1cf61cee61adfb59acf0d255fbe3e55d4ccec8 /libgcc
parent27b34082f037de30b630f191be2488cd5902286d (diff)
PR target/85591
* config/i386/cpuinfo.c (get_amd_cpu): Return AMDFAM15H_BDVER2 for AMDFAM15H model 0x2. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@261042 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/config/i386/cpuinfo.c11
2 files changed, 13 insertions, 4 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 832708a98d0..8be2cc558cf 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-31 Uros Bizjak <ubizjak@gmail.com>
+
+ PR target/85591
+ * config/i386/cpuinfo.c (get_amd_cpu): Return
+ AMDFAM15H_BDVER2 for AMDFAM15H model 0x2.
+
2018-05-07 Chung-Ju Wu <jasonwucj@gmail.com>
Backport from mainline.
diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
index 86953db2743..d1853d5515b 100644
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
@@ -83,17 +83,20 @@ get_amd_cpu (unsigned int family, unsigned int model)
/* AMD Family 15h "Bulldozer". */
case 0x15:
__cpu_model.__cpu_type = AMDFAM15H;
+
+ if (model == 0x2)
+ __cpu_model.__cpu_subtype = AMDFAM15H_BDVER2;
/* Bulldozer version 1. */
- if ( model <= 0xf)
+ else if (model <= 0xf)
__cpu_model.__cpu_subtype = AMDFAM15H_BDVER1;
/* Bulldozer version 2 "Piledriver" */
- if (model >= 0x10 && model <= 0x2f)
+ else if (model <= 0x2f)
__cpu_model.__cpu_subtype = AMDFAM15H_BDVER2;
/* Bulldozer version 3 "Steamroller" */
- if (model >= 0x30 && model <= 0x4f)
+ else if (model <= 0x4f)
__cpu_model.__cpu_subtype = AMDFAM15H_BDVER3;
/* Bulldozer version 4 "Excavator" */
- if (model >= 0x60 && model <= 0x7f)
+ else if (model <= 0x7f)
__cpu_model.__cpu_subtype = AMDFAM15H_BDVER4;
break;
/* AMD Family 16h "btver2" */