From: Uros Bizjak <ubizjak@gmail.com>
Date: Fri, 8 Jun 2007 11:34:56 +0000 (+0200)
Subject: i386.c (override_options): Merge TARGET_SSE4_2 and TARGET_ABM handling of x86_popcnt... 
X-Git-Tag: releases/gcc-4.3.0~4552
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=837a895482f11eb619aec3e7495469f5c3b09545;p=thirdparty%2Fgcc.git

i386.c (override_options): Merge TARGET_SSE4_2 and TARGET_ABM handling of x86_popcnt variable.

	* config/i386/i386.c (override_options): Merge TARGET_SSE4_2 and
	TARGET_ABM handling of x86_popcnt variable.

From-SVN: r125570
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ef4d8c6b635..a0bc597fdf05 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-08  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (override_options): Merge TARGET_SSE4_2 and
+	TARGET_ABM handling of x86_popcnt variable.
+
 2007-06-08  Uros Bizjak  <ubizjak@gmail.com>
 
 	* doc/extend.texi (X86 Built-in Functions): Document __builtin_fabsq,
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index c8939004d5e2..eb7ff51399a1 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2267,12 +2267,9 @@ override_options (void)
   if (!TARGET_80387)
     target_flags |= MASK_NO_FANCY_MATH_387;
 
-  /* Turn on SSE4.1 builtins and popcnt instruction for -msse4.2.  */
+  /* Turn on SSE4.1 builtins for -msse4.2.  */
   if (TARGET_SSE4_2)
-    {
-      ix86_isa_flags |= OPTION_MASK_ISA_SSE4_1;
-      x86_popcnt = true;
-    }
+    ix86_isa_flags |= OPTION_MASK_ISA_SSE4_1;
 
   /* Turn on SSSE3 builtins for -msse4.1.  */
   if (TARGET_SSE4_1)
@@ -2305,8 +2302,8 @@ override_options (void)
   if (TARGET_3DNOW)
     ix86_isa_flags |= OPTION_MASK_ISA_MMX;
 
-  /* Turn on POPCNT builtins for -mabm.  */
-  if (TARGET_ABM)
+  /* Turn on popcnt instruction for -msse4.2 or -mabm.  */
+  if (TARGET_SSE4_2 || TARGET_ABM)
     x86_popcnt = true;
 
   /* Validate -mpreferred-stack-boundary= value, or provide default.