diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-03 15:56:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-03 15:56:31 +0000 |
| commit | 4254ad78d813b8c4cfc6c07218aee6b1be554f23 (patch) | |
| tree | 8e9350d7e0339c5c7da9499ab5742527e21520c6 /gcc-4.9/gcc/config/i386/driver-i386.c | |
| parent | 9bba04175106d9b9e8a58715e3e7fa560c13e092 (diff) | |
| parent | e97c99f15937e5762a973b25192aab824126a6d3 (diff) | |
| download | toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.gz toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.bz2 toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.zip | |
Merge "[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch. Merge gcc-4_9 source r214745 from google/gcc-4_9 branch."
Diffstat (limited to 'gcc-4.9/gcc/config/i386/driver-i386.c')
| -rw-r--r-- | gcc-4.9/gcc/config/i386/driver-i386.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/config/i386/driver-i386.c b/gcc-4.9/gcc/config/i386/driver-i386.c index 80f6a0879..722c54692 100644 --- a/gcc-4.9/gcc/config/i386/driver-i386.c +++ b/gcc-4.9/gcc/config/i386/driver-i386.c @@ -431,7 +431,8 @@ const char *host_detect_local_cpu (int argc, const char **argv) model = (eax >> 4) & 0x0f; family = (eax >> 8) & 0x0f; - if (vendor == signature_INTEL_ebx) + if (vendor == signature_INTEL_ebx + || vendor == signature_AMD_ebx) { unsigned int extended_model, extended_family; @@ -570,7 +571,7 @@ const char *host_detect_local_cpu (int argc, const char **argv) if (name == signature_NSC_ebx) processor = PROCESSOR_GEODE; - else if (has_movbe) + else if (has_movbe && family == 22) processor = PROCESSOR_BTVER2; else if (has_avx2) processor = PROCESSOR_BDVER4; |