backport: re PR target/48743 (-march=native mis-detects AMD K6-2+ / K6-3 as Athlon...

2012-02-07  Quentin Neill  <quentin.neill@amd.com>

	Backport from mainline:
	2012-01-19  Quentin Neill  <quentin.neill@amd.com>

	PR target/48743
	* config/i386/driver-i386.c (host_detect_local_cpu): Also check
	family to distinguish PROCESSOR_ATHLON.

From-SVN: r183973

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 92e558b9a62a65e3167a0575a1e957631537245b..a08b2e8ec692d8142783b1716fe76bfa7440e991 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-07  Quentin Neill  <quentin.neill@amd.com>
+
+       Backport from mainline:
+       2012-01-19  Quentin Neill  <quentin.neill@amd.com>
+
+       PR target/48743
+       * config/i386/driver-i386.c (host_detect_local_cpu): Also check
+       family to distinguish PROCESSOR_ATHLON.
+
 2012-02-07  Kai Tietz  <ktietz@redhat.com>
             Dave Korn  <dave.korn.cygwin@gmail.com>
 

diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
index 063279aa629e4e8a9879762732c5cbea817e79f5..9f3adcc923ec3d84fa46f57ce44ea26e61d7c5ac 100644 (file)
--- a/gcc/config/i386/driver-i386.c
+++ b/gcc/config/i386/driver-i386.c
@@ -494,7 +494,7 @@ const char *host_detect_local_cpu (int argc, const char **argv)
        processor = PROCESSOR_AMDFAM10;
       else if (has_sse2 || has_longmode)
        processor = PROCESSOR_K8;
-      else if (has_3dnowp)
+      else if (has_3dnowp && family == 6)
        processor = PROCESSOR_ATHLON;
       else if (has_mmx)
        processor = PROCESSOR_K6;