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

	* 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 6ef4d8c6b6359137e1b7202046256c8bf0d55738..a0bc597fdf0570c22b7482479d720095f15df781 100644 (file)
--- 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 c8939004d5e27ec6305541e16e226debd2860e1c..eb7ff51399a1da9d0d47265255baf06e189c5160 100644 (file)
--- 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.