i386-2.C: Add -mpopcnt -mabm -mlwp to dg-options.

	* g++.dg/other/i386-2.C: Add -mpopcnt -mabm -mlwp to dg-options.
	* g++.dg/other/i386-3.C: Ditto.
	* g++.dg/other/i386-5.C: Remove duplicated test.
	* g++.dg/other/i386-6.C: Ditto.

From-SVN: r155238

6 files changed, 24 insertions, 27 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 467a8a2..94cbf10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -124,7 +124,7 @@
 	(divmodhi4): Ditto.
 	(udivmodhi4): Ditto.
 	(divmodsi4): Ditto.
-	(udivmodsi4): Ditto. 
+	(udivmodsi4): Ditto.
 
 2009-12-13  Richard Guenther  <rguenther@suse.de>
 
@@ -271,7 +271,7 @@
 
 	* builtins.c (do_mpc_ckconv): Pass the component type to
 	real_from_mpfr().
-	
+
 2009-12-09  Xinliang David Li  <davidxl@google.com>
 
 	PR tree-optimization/42337
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ddef45b..bc25d61 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-14  Uros Bizjak  <ubizjak@gmail.com>
+
+	* g++.dg/other/i386-2.C: Add -mpopcnt -mabm -mlwp to dg-options.
+	* g++.dg/other/i386-3.C: Ditto.
+	* g++.dg/other/i386-5.C: Remove duplicated test.
+	* g++.dg/other/i386-6.C: Ditto.
+
 2009-12-14  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/42354
@@ -109,7 +116,7 @@
 	* gfortran.dg/typebound_proc_13.f03: New test.
 
 2009-12-08  Olga Golovanevsky  <olga@il.ibm.com>
-	    Jakub Jelinek <jakub@redhat.com>	
+	    Jakub Jelinek <jakub@redhat.com>
 
 	PR midle-end/41843
 	* gcc.dg/struct/wo_prof_empty_str.c: New testcase.
@@ -253,7 +260,7 @@
 	PR c++/41611
 	* g++.dg/abi/guard1.C: New.
 
-2009-12-91  Uros Bizjak  <ubizjak@gmail.com>
+2009-12-01  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/vperm-v4sf-1.c (dg-options): Use -msse.
 
@@ -567,7 +574,7 @@
 	* gcc-dg/raw-string-2.c: Ditto.
 	* gcc-dg/utf-array-short-wchar.c: Ditto.
 	* gcc-dg/utf-array.c: Ditto.
-	* gcc-dg/utf8-2.c: Ditto. 
+	* gcc-dg/utf8-2.c: Ditto.
 
 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
@@ -793,7 +800,7 @@
 	* gcc.misc-tests/linkage.exp: Also check -m32 for i*86-*-linux*.
 
 2009-11-18  Nick Clifton  <nickc@redhat.com>
-	
+
 	* g++.dg/lto/20091002-1_0.C: Replace -shared with -r -nostlib.
 	* g++.dg/lto/20081120-1_0.C: Likewise.
 	* g++.dg/lto/20091002-2_0.C: Likewise.
@@ -1208,7 +1215,7 @@
 	* g++.dg/other/i386-3.C: Ditto.
 	* g++.dg/other/i386-5.C: Ditto.
 	* g++.dg/other/i386-6.C: Ditto.
-	
+
 2009-11-04  Wei Guozhi  <carrot@google.com>
 
 	PR target/40835
diff --git a/gcc/testsuite/g++.dg/other/i386-2.C b/gcc/testsuite/g++.dg/other/i386-2.C
index 1ef6b27..952fa14 100644
--- a/gcc/testsuite/g++.dg/other/i386-2.C
+++ b/gcc/testsuite/g++.dg/other/i386-2.C
@@ -1,7 +1,9 @@
-/* Test that {,x,e,p,t,s,w,a,i}mmintrin.h, fma4intrin.h, xopintrin.h, mm3dnow.h and
-   mm_malloc.h are usable with -O -pedantic-errors.  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -mavx -msse4a -mfma4 -mxop -maes -mpclmul" } */
+/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -mavx -mxop -maes -mpclmul -mpopcnt -mabm -mlwp" } */
+
+/* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, xopintrin.h, abmintrin.h,
+   lwpintrin.h, popcntintrin.h and mm3dnow.h are usable with
+   -O -pedantic-errors.  */
 
 #include <x86intrin.h>
 
diff --git a/gcc/testsuite/g++.dg/other/i386-3.C b/gcc/testsuite/g++.dg/other/i386-3.C
index df33af8b..88dd769 100644
--- a/gcc/testsuite/g++.dg/other/i386-3.C
+++ b/gcc/testsuite/g++.dg/other/i386-3.C
@@ -1,6 +1,8 @@
-/* Test that {,x,e,p,t,s,w,a,i}mmintrin.h, fma4intrin.h, mm3dnow.h, xopintrin.h and
-    mm_malloc.h are usable with -O -fkeep-inline-functions.  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -fkeep-inline-functions -march=k8 -m3dnow -mavx -msse4a -mfma4 -mxop -maes -mpclmul" } */
+/* { dg-options "-O -fkeep-inline-functions -march=k8 -m3dnow -mavx -mxop -maes -mpclmul -mpopcnt -mabm -mlwp" } */
+
+/* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, xopintrin.h, abmintrin.h,
+   lwpintrin.h, popcntintrin.h and mm3dnow.h are usable with
+   -O -fkeep-inline-functions.  */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/g++.dg/other/i386-5.C b/gcc/testsuite/g++.dg/other/i386-5.C
deleted file mode 100644
index 383aae3..0000000
--- a/gcc/testsuite/g++.dg/other/i386-5.C
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Test that {,x,e,p,t,s,w,a,i}mmintrin.h, fma4intrin.h, xopintrin.h, mm3dnow.h and
-   mm_malloc.h are usable with -O -fkeep-inline-functions.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -fkeep-inline-functions -march=k8 -m3dnow -mavx -msse4a -mfma4 -mxop -maes -mpclmul" } */
-
-#include <x86intrin.h>
diff --git a/gcc/testsuite/g++.dg/other/i386-6.C b/gcc/testsuite/g++.dg/other/i386-6.C
deleted file mode 100644
index 2bd4609..0000000
--- a/gcc/testsuite/g++.dg/other/i386-6.C
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Test that {,x,e,p,t,s,w,a,i}mmintrin.h, fma4intrin.h, xopintrin.h, mm3dnow.h and
-   mm_malloc.h are usable with -O -pedantic-errors.  */
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O -pedantic-errors -march=k8 -m3dnow -mavx -msse4a -mfma4 -mxop -maes -mpclmul" } */
-
-#include <x86intrin.h>
-
-int dummy;