20000609-1.c, [...]: Move from gcc.dg/.

	* gcc.target/i386/20000609-1.c, gcc.target/i386/20000614-1.c,
	gcc.target/i386/20000614-2.c, gcc.target/i386/20000720-1.c,
	gcc.target/i386/20000807-1.c, gcc.target/i386/20000904-1.c,
	gcc.target/i386/20001127-1.c, gcc.target/i386/20010202-1.c,
	gcc.target/i386/20010520-1.c, gcc.target/i386/20011009-1.c,
	gcc.target/i386/20011029-2.c, gcc.target/i386/20011107-1.c,
	gcc.target/i386/20011119-1.c, gcc.target/i386/20020201-3.c,
	gcc.target/i386/20020218-1.c, gcc.target/i386/20020224-1.c,
	gcc.target/i386/20020426-1.c, gcc.target/i386/20020523-1.c,
	gcc.target/i386/20020523-2.c, gcc.target/i386/20020531-1.c,
	gcc.target/i386/20020616-1.c, gcc.target/i386/20020729-1.c,
	gcc.target/i386/20030217-1.c, gcc.target/i386/20030926-1.c,
	gcc.target/i386/20040112-1.c, gcc.target/i386/20050113-1.c,
	gcc.target/i386/980211-1.c, gcc.target/i386/980226-1.c,
	gcc.target/i386/980414-1.c, gcc.target/i386/980520-1.c,
	gcc.target/i386/980709-1.c, gcc.target/i386/990117-1.c,
	gcc.target/i386/990130-1.c, gcc.target/i386/990213-2.c,
	gcc.target/i386/990214-1.c, gcc.target/i386/990424-1.c,
	gcc.target/i386/990524-1.c, gcc.target/i386/991129-1.c,
	gcc.target/i386/991209-1.c, gcc.target/i386/991214-1.c,
	gcc.target/i386/991230-1.c, gcc.target/i386/pr12092-1.c,
	gcc.target/i386/pr14289-1.c, gcc.target/i386/pr18614-1.c,
	gcc.target/i386/pr19236-1.c, gcc.target/i386/pr20204.c,
	gcc.target/i386/pr23943.c, gcc.target/i386/pr9771-1.c:
	Move from gcc.dg/.
	* gcc.target/i386/387-1.c, gcc.target/i386/387-2.c,
	gcc.target/i386/387-3.c, gcc.target/i386/387-4.c,
	gcc.target/i386/387-5.c, gcc.target/i386/387-6.c,
	gcc.target/i386/387-7.c, gcc.target/i386/387-8.c,
	gcc.target/i386/3dnow-1.c, gcc.target/i386/3dnow-2.c,
	gcc.target/i386/3dnowA-1.c, gcc.target/i386/3dnowA-2.c,
	gcc.target/i386/asm-2.c, gcc.target/i386/asm-3.c,
	gcc.target/i386/asm-4.c, gcc.target/i386/bitfield1.c,
	gcc.target/i386/bitfield2.c, gcc.target/i386/bitfield3.c,
	gcc.target/i386/cadd.c, gcc.target/i386/call-1.c,
	gcc.target/i386/clobbers.c, gcc.target/i386/cmov1.c,
	gcc.target/i386/cmov2.c, gcc.target/i386/cmov3.c,
	gcc.target/i386/cmov4.c, gcc.target/i386/cmov5.c,
	gcc.target/i386/cvt-1.c, gcc.target/i386/fastcall-1.c,
	gcc.target/i386/fpcvt-1.c, gcc.target/i386/fpcvt-2.c,
	gcc.target/i386/fpcvt-3.c, gcc.target/i386/fpcvt-4.c,
	gcc.target/i386/lea.c, gcc.target/i386/local.c,
	gcc.target/i386/local2.c, gcc.target/i386/loop-1.c,
	gcc.target/i386/loop-2.c, gcc.target/i386/loop-3.c,
	gcc.target/i386/memset-1.c, gcc.target/i386/mmx-1.c,
	gcc.target/i386/mmx-2.c, gcc.target/i386/mmx-3.c,
	gcc.target/i386/mmx-4.c, gcc.target/i386/mmx-5.c,
	gcc.target/i386/mmx-6.c, gcc.target/i386/mul.c,
	gcc.target/i386/pentium4-not-mull.c, gcc.target/i386/pic-1.c,
	gcc.target/i386/regparm.c, gcc.target/i386/rotate-1.c,
	gcc.target/i386/sibcall-5.c, gcc.target/i386/signbit-1.c,
	gcc.target/i386/signbit-2.c, gcc.target/i386/signbit-3.c,
	gcc.target/i386/sse-10.c, gcc.target/i386/sse-11.c,
	gcc.target/i386/sse-12.c, gcc.target/i386/sse-5.c,
	gcc.target/i386/sse-6.c, gcc.target/i386/sse-7.c,
	gcc.target/i386/sse-8.c, gcc.target/i386/sse-9.c,
	gcc.target/i386/sse-vect-types.c, gcc.target/i386/ssefn-1.c,
	gcc.target/i386/ssefn-2.c, gcc.target/i386/ssefn-3.c,
	gcc.target/i386/ssefn-4.c, gcc.target/i386/ssefp-1.c,
	gcc.target/i386/ssefp-2.c, gcc.target/i386/ssetype-1.c,
	gcc.target/i386/ssetype-2.c, gcc.target/i386/ssetype-3.c,
	gcc.target/i386/ssetype-4.c, gcc.target/i386/ssetype-5.c,
	gcc.target/i386/unroll-1.c, gcc.target/i386/volatile-1.c,
	gcc.target/i386/xorps.c:  Move from gcc.dg/i386-*.
	* gcc.target/i386/pr23376.c: Move from gcc.target/x86_64/pr23376.c.
	* gcc.target/i386/asm-5.c: Move from gcc.dg/asm-1.c.
	* gcc.target/i386/sse-13.c: Move from gcc.dg/i386-sse-1.c.
	* gcc.target/i386/sse-14.c: Move from gcc.dg/i386-sse-2.c.
	* gcc.target/i386/sse-15.c: Move from gcc.dg/i386-sse-3.c.
	* gcc.target/i386/sse-16.c: Move from gcc.dg/i386-sse-4.c.

From-SVN: r106504

132 files changed, 80 insertions, 7 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e49aa24338..0b0b8ad04cd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,76 @@
+2005-11-04  Richard Henderson  <rth@redhat.com>
+
+	* gcc.target/i386/20000609-1.c, gcc.target/i386/20000614-1.c,
+	gcc.target/i386/20000614-2.c, gcc.target/i386/20000720-1.c,
+	gcc.target/i386/20000807-1.c, gcc.target/i386/20000904-1.c,
+	gcc.target/i386/20001127-1.c, gcc.target/i386/20010202-1.c,
+	gcc.target/i386/20010520-1.c, gcc.target/i386/20011009-1.c,
+	gcc.target/i386/20011029-2.c, gcc.target/i386/20011107-1.c,
+	gcc.target/i386/20011119-1.c, gcc.target/i386/20020201-3.c,
+	gcc.target/i386/20020218-1.c, gcc.target/i386/20020224-1.c,
+	gcc.target/i386/20020426-1.c, gcc.target/i386/20020523-1.c,
+	gcc.target/i386/20020523-2.c, gcc.target/i386/20020531-1.c,
+	gcc.target/i386/20020616-1.c, gcc.target/i386/20020729-1.c,
+	gcc.target/i386/20030217-1.c, gcc.target/i386/20030926-1.c,
+	gcc.target/i386/20040112-1.c, gcc.target/i386/20050113-1.c,
+	gcc.target/i386/980211-1.c, gcc.target/i386/980226-1.c,
+	gcc.target/i386/980414-1.c, gcc.target/i386/980520-1.c,
+	gcc.target/i386/980709-1.c, gcc.target/i386/990117-1.c,
+	gcc.target/i386/990130-1.c, gcc.target/i386/990213-2.c,
+	gcc.target/i386/990214-1.c, gcc.target/i386/990424-1.c,
+	gcc.target/i386/990524-1.c, gcc.target/i386/991129-1.c,
+	gcc.target/i386/991209-1.c, gcc.target/i386/991214-1.c,
+	gcc.target/i386/991230-1.c, gcc.target/i386/pr12092-1.c,
+	gcc.target/i386/pr14289-1.c, gcc.target/i386/pr18614-1.c,
+	gcc.target/i386/pr19236-1.c, gcc.target/i386/pr20204.c,
+	gcc.target/i386/pr23943.c, gcc.target/i386/pr9771-1.c:
+	Move from gcc.dg/.
+	* gcc.target/i386/387-1.c, gcc.target/i386/387-2.c,
+	gcc.target/i386/387-3.c, gcc.target/i386/387-4.c,
+	gcc.target/i386/387-5.c, gcc.target/i386/387-6.c,
+	gcc.target/i386/387-7.c, gcc.target/i386/387-8.c,
+	gcc.target/i386/3dnow-1.c, gcc.target/i386/3dnow-2.c,
+	gcc.target/i386/3dnowA-1.c, gcc.target/i386/3dnowA-2.c,
+	gcc.target/i386/asm-2.c, gcc.target/i386/asm-3.c,
+	gcc.target/i386/asm-4.c, gcc.target/i386/bitfield1.c,
+	gcc.target/i386/bitfield2.c, gcc.target/i386/bitfield3.c,
+	gcc.target/i386/cadd.c, gcc.target/i386/call-1.c,
+	gcc.target/i386/clobbers.c, gcc.target/i386/cmov1.c,
+	gcc.target/i386/cmov2.c, gcc.target/i386/cmov3.c,
+	gcc.target/i386/cmov4.c, gcc.target/i386/cmov5.c,
+	gcc.target/i386/cvt-1.c, gcc.target/i386/fastcall-1.c,
+	gcc.target/i386/fpcvt-1.c, gcc.target/i386/fpcvt-2.c,
+	gcc.target/i386/fpcvt-3.c, gcc.target/i386/fpcvt-4.c,
+	gcc.target/i386/lea.c, gcc.target/i386/local.c,
+	gcc.target/i386/local2.c, gcc.target/i386/loop-1.c,
+	gcc.target/i386/loop-2.c, gcc.target/i386/loop-3.c,
+	gcc.target/i386/memset-1.c, gcc.target/i386/mmx-1.c,
+	gcc.target/i386/mmx-2.c, gcc.target/i386/mmx-3.c,
+	gcc.target/i386/mmx-4.c, gcc.target/i386/mmx-5.c,
+	gcc.target/i386/mmx-6.c, gcc.target/i386/mul.c,
+	gcc.target/i386/pentium4-not-mull.c, gcc.target/i386/pic-1.c,
+	gcc.target/i386/regparm.c, gcc.target/i386/rotate-1.c,
+	gcc.target/i386/sibcall-5.c, gcc.target/i386/signbit-1.c,
+	gcc.target/i386/signbit-2.c, gcc.target/i386/signbit-3.c,
+	gcc.target/i386/sse-10.c, gcc.target/i386/sse-11.c,
+	gcc.target/i386/sse-12.c, gcc.target/i386/sse-5.c,
+	gcc.target/i386/sse-6.c, gcc.target/i386/sse-7.c,
+	gcc.target/i386/sse-8.c, gcc.target/i386/sse-9.c,
+	gcc.target/i386/sse-vect-types.c, gcc.target/i386/ssefn-1.c,
+	gcc.target/i386/ssefn-2.c, gcc.target/i386/ssefn-3.c,
+	gcc.target/i386/ssefn-4.c, gcc.target/i386/ssefp-1.c,
+	gcc.target/i386/ssefp-2.c, gcc.target/i386/ssetype-1.c,
+	gcc.target/i386/ssetype-2.c, gcc.target/i386/ssetype-3.c,
+	gcc.target/i386/ssetype-4.c, gcc.target/i386/ssetype-5.c,
+	gcc.target/i386/unroll-1.c, gcc.target/i386/volatile-1.c,
+	gcc.target/i386/xorps.c:  Move from gcc.dg/i386-*.
+	* gcc.target/i386/pr23376.c: Move from gcc.target/x86_64/pr23376.c.
+	* gcc.target/i386/asm-5.c: Move from gcc.dg/asm-1.c.
+	* gcc.target/i386/sse-13.c: Move from gcc.dg/i386-sse-1.c.
+	* gcc.target/i386/sse-14.c: Move from gcc.dg/i386-sse-2.c.
+	* gcc.target/i386/sse-15.c: Move from gcc.dg/i386-sse-3.c.
+	* gcc.target/i386/sse-16.c: Move from gcc.dg/i386-sse-4.c.
+
 2005-11-04  Diego Novillo  <dnovillo@redhat.com>
 
 	PR 24627
diff --git a/gcc/testsuite/gcc.dg/20000609-1.c b/gcc/testsuite/gcc.target/i386/20000609-1.c
index 5d452ac9d82..5d452ac9d82 100644
--- a/gcc/testsuite/gcc.dg/20000609-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000609-1.c
diff --git a/gcc/testsuite/gcc.dg/20000614-1.c b/gcc/testsuite/gcc.target/i386/20000614-1.c
index 507596787a6..507596787a6 100644
--- a/gcc/testsuite/gcc.dg/20000614-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000614-1.c
diff --git a/gcc/testsuite/gcc.dg/20000614-2.c b/gcc/testsuite/gcc.target/i386/20000614-2.c
index eb30fc6cd55..eb30fc6cd55 100644
--- a/gcc/testsuite/gcc.dg/20000614-2.c
+++ b/gcc/testsuite/gcc.target/i386/20000614-2.c
diff --git a/gcc/testsuite/gcc.dg/20000720-1.c b/gcc/testsuite/gcc.target/i386/20000720-1.c
index 65bf68544b4..65bf68544b4 100644
--- a/gcc/testsuite/gcc.dg/20000720-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000720-1.c
diff --git a/gcc/testsuite/gcc.dg/20000807-1.c b/gcc/testsuite/gcc.target/i386/20000807-1.c
index 360e3245989..360e3245989 100644
--- a/gcc/testsuite/gcc.dg/20000807-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000807-1.c
diff --git a/gcc/testsuite/gcc.dg/20000904-1.c b/gcc/testsuite/gcc.target/i386/20000904-1.c
index 31f937cab71..31f937cab71 100644
--- a/gcc/testsuite/gcc.dg/20000904-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000904-1.c
diff --git a/gcc/testsuite/gcc.dg/20001127-1.c b/gcc/testsuite/gcc.target/i386/20001127-1.c
index f63d1149322..f63d1149322 100644
--- a/gcc/testsuite/gcc.dg/20001127-1.c
+++ b/gcc/testsuite/gcc.target/i386/20001127-1.c
diff --git a/gcc/testsuite/gcc.dg/20010202-1.c b/gcc/testsuite/gcc.target/i386/20010202-1.c
index 5f789042eba..5f789042eba 100644
--- a/gcc/testsuite/gcc.dg/20010202-1.c
+++ b/gcc/testsuite/gcc.target/i386/20010202-1.c
diff --git a/gcc/testsuite/gcc.dg/20010520-1.c b/gcc/testsuite/gcc.target/i386/20010520-1.c
index 97ee32b0b82..97ee32b0b82 100644
--- a/gcc/testsuite/gcc.dg/20010520-1.c
+++ b/gcc/testsuite/gcc.target/i386/20010520-1.c
diff --git a/gcc/testsuite/gcc.dg/20011009-1.c b/gcc/testsuite/gcc.target/i386/20011009-1.c
index b78d99e997b..b78d99e997b 100644
--- a/gcc/testsuite/gcc.dg/20011009-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011009-1.c
diff --git a/gcc/testsuite/gcc.dg/20011029-2.c b/gcc/testsuite/gcc.target/i386/20011029-2.c
index 07ef1a806fe..07ef1a806fe 100644
--- a/gcc/testsuite/gcc.dg/20011029-2.c
+++ b/gcc/testsuite/gcc.target/i386/20011029-2.c
diff --git a/gcc/testsuite/gcc.dg/20011107-1.c b/gcc/testsuite/gcc.target/i386/20011107-1.c
index 0d09427a0b4..0d09427a0b4 100644
--- a/gcc/testsuite/gcc.dg/20011107-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011107-1.c
diff --git a/gcc/testsuite/gcc.dg/20011119-1.c b/gcc/testsuite/gcc.target/i386/20011119-1.c
index bbdf104d1c8..bbdf104d1c8 100644
--- a/gcc/testsuite/gcc.dg/20011119-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011119-1.c
diff --git a/gcc/testsuite/gcc.dg/20020201-3.c b/gcc/testsuite/gcc.target/i386/20020201-3.c
index e95c44fbdfb..e95c44fbdfb 100644
--- a/gcc/testsuite/gcc.dg/20020201-3.c
+++ b/gcc/testsuite/gcc.target/i386/20020201-3.c
diff --git a/gcc/testsuite/gcc.dg/20020218-1.c b/gcc/testsuite/gcc.target/i386/20020218-1.c
index bef4d66fc13..bef4d66fc13 100644
--- a/gcc/testsuite/gcc.dg/20020218-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020218-1.c
diff --git a/gcc/testsuite/gcc.dg/20020224-1.c b/gcc/testsuite/gcc.target/i386/20020224-1.c
index c37de2e21b7..c37de2e21b7 100644
--- a/gcc/testsuite/gcc.dg/20020224-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020224-1.c
diff --git a/gcc/testsuite/gcc.dg/20020426-1.c b/gcc/testsuite/gcc.target/i386/20020426-1.c
index 31be74712c0..31be74712c0 100644
--- a/gcc/testsuite/gcc.dg/20020426-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020426-1.c
diff --git a/gcc/testsuite/gcc.dg/20020523-1.c b/gcc/testsuite/gcc.target/i386/20020523-1.c
index 51ae5ecb689..51ae5ecb689 100644
--- a/gcc/testsuite/gcc.dg/20020523-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020523-1.c
diff --git a/gcc/testsuite/gcc.dg/20020523-2.c b/gcc/testsuite/gcc.target/i386/20020523-2.c
index ebe8bb8f5cd..ebe8bb8f5cd 100644
--- a/gcc/testsuite/gcc.dg/20020523-2.c
+++ b/gcc/testsuite/gcc.target/i386/20020523-2.c
diff --git a/gcc/testsuite/gcc.dg/20020531-1.c b/gcc/testsuite/gcc.target/i386/20020531-1.c
index dfefc17c45a..dfefc17c45a 100644
--- a/gcc/testsuite/gcc.dg/20020531-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020531-1.c
diff --git a/gcc/testsuite/gcc.dg/20020616-1.c b/gcc/testsuite/gcc.target/i386/20020616-1.c
index 6db78425596..6db78425596 100644
--- a/gcc/testsuite/gcc.dg/20020616-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020616-1.c
diff --git a/gcc/testsuite/gcc.dg/20020729-1.c b/gcc/testsuite/gcc.target/i386/20020729-1.c
index eeab6985422..eeab6985422 100644
--- a/gcc/testsuite/gcc.dg/20020729-1.c
+++ b/gcc/testsuite/gcc.target/i386/20020729-1.c
diff --git a/gcc/testsuite/gcc.dg/20030217-1.c b/gcc/testsuite/gcc.target/i386/20030217-1.c
index d0cd91316c4..d0cd91316c4 100644
--- a/gcc/testsuite/gcc.dg/20030217-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030217-1.c
diff --git a/gcc/testsuite/gcc.dg/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c
index 866ebb808d5..866ebb808d5 100644
--- a/gcc/testsuite/gcc.dg/20030926-1.c
+++ b/gcc/testsuite/gcc.target/i386/20030926-1.c
diff --git a/gcc/testsuite/gcc.dg/20040112-1.c b/gcc/testsuite/gcc.target/i386/20040112-1.c
index 83996fe6c23..83996fe6c23 100644
--- a/gcc/testsuite/gcc.dg/20040112-1.c
+++ b/gcc/testsuite/gcc.target/i386/20040112-1.c
diff --git a/gcc/testsuite/gcc.dg/20050113-1.c b/gcc/testsuite/gcc.target/i386/20050113-1.c
index e7f69e36641..e7f69e36641 100644
--- a/gcc/testsuite/gcc.dg/20050113-1.c
+++ b/gcc/testsuite/gcc.target/i386/20050113-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-1.c b/gcc/testsuite/gcc.target/i386/387-1.c
index 9b31dcaed55..9b31dcaed55 100644
--- a/gcc/testsuite/gcc.dg/i386-387-1.c
+++ b/gcc/testsuite/gcc.target/i386/387-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-2.c b/gcc/testsuite/gcc.target/i386/387-2.c
index 7358866eceb..7358866eceb 100644
--- a/gcc/testsuite/gcc.dg/i386-387-2.c
+++ b/gcc/testsuite/gcc.target/i386/387-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-3.c b/gcc/testsuite/gcc.target/i386/387-3.c
index ed80f78187d..ed80f78187d 100644
--- a/gcc/testsuite/gcc.dg/i386-387-3.c
+++ b/gcc/testsuite/gcc.target/i386/387-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-4.c b/gcc/testsuite/gcc.target/i386/387-4.c
index 55398275570..55398275570 100644
--- a/gcc/testsuite/gcc.dg/i386-387-4.c
+++ b/gcc/testsuite/gcc.target/i386/387-4.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-5.c b/gcc/testsuite/gcc.target/i386/387-5.c
index fd3106e0270..fd3106e0270 100644
--- a/gcc/testsuite/gcc.dg/i386-387-5.c
+++ b/gcc/testsuite/gcc.target/i386/387-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-6.c b/gcc/testsuite/gcc.target/i386/387-6.c
index b3ad64dac48..b3ad64dac48 100644
--- a/gcc/testsuite/gcc.dg/i386-387-6.c
+++ b/gcc/testsuite/gcc.target/i386/387-6.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-7.c b/gcc/testsuite/gcc.target/i386/387-7.c
index edcdac1ae3f..edcdac1ae3f 100644
--- a/gcc/testsuite/gcc.dg/i386-387-7.c
+++ b/gcc/testsuite/gcc.target/i386/387-7.c
diff --git a/gcc/testsuite/gcc.dg/i386-387-8.c b/gcc/testsuite/gcc.target/i386/387-8.c
index 6af895998d0..6af895998d0 100644
--- a/gcc/testsuite/gcc.dg/i386-387-8.c
+++ b/gcc/testsuite/gcc.target/i386/387-8.c
diff --git a/gcc/testsuite/gcc.dg/i386-3dnow-1.c b/gcc/testsuite/gcc.target/i386/3dnow-1.c
index a8dcb419c7e..a8dcb419c7e 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnow-1.c
+++ b/gcc/testsuite/gcc.target/i386/3dnow-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-3dnow-2.c b/gcc/testsuite/gcc.target/i386/3dnow-2.c
index d9aa7a56420..d9aa7a56420 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnow-2.c
+++ b/gcc/testsuite/gcc.target/i386/3dnow-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-3dnowA-1.c b/gcc/testsuite/gcc.target/i386/3dnowA-1.c
index 80209b00c29..80209b00c29 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnowA-1.c
+++ b/gcc/testsuite/gcc.target/i386/3dnowA-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-3dnowA-2.c b/gcc/testsuite/gcc.target/i386/3dnowA-2.c
index 0cce3b1318c..0cce3b1318c 100644
--- a/gcc/testsuite/gcc.dg/i386-3dnowA-2.c
+++ b/gcc/testsuite/gcc.target/i386/3dnowA-2.c
diff --git a/gcc/testsuite/gcc.dg/980211-1.c b/gcc/testsuite/gcc.target/i386/980211-1.c
index 973a30fbd67..973a30fbd67 100644
--- a/gcc/testsuite/gcc.dg/980211-1.c
+++ b/gcc/testsuite/gcc.target/i386/980211-1.c
diff --git a/gcc/testsuite/gcc.dg/980226-1.c b/gcc/testsuite/gcc.target/i386/980226-1.c
index 52ff614ed3a..52ff614ed3a 100644
--- a/gcc/testsuite/gcc.dg/980226-1.c
+++ b/gcc/testsuite/gcc.target/i386/980226-1.c
diff --git a/gcc/testsuite/gcc.dg/980414-1.c b/gcc/testsuite/gcc.target/i386/980414-1.c
index e179c8137c0..e179c8137c0 100644
--- a/gcc/testsuite/gcc.dg/980414-1.c
+++ b/gcc/testsuite/gcc.target/i386/980414-1.c
diff --git a/gcc/testsuite/gcc.dg/980520-1.c b/gcc/testsuite/gcc.target/i386/980520-1.c
index b11f0d3a893..b11f0d3a893 100644
--- a/gcc/testsuite/gcc.dg/980520-1.c
+++ b/gcc/testsuite/gcc.target/i386/980520-1.c
diff --git a/gcc/testsuite/gcc.dg/980709-1.c b/gcc/testsuite/gcc.target/i386/980709-1.c
index 01b6bfe358e..01b6bfe358e 100644
--- a/gcc/testsuite/gcc.dg/980709-1.c
+++ b/gcc/testsuite/gcc.target/i386/980709-1.c
diff --git a/gcc/testsuite/gcc.dg/990117-1.c b/gcc/testsuite/gcc.target/i386/990117-1.c
index 24c56f2febf..24c56f2febf 100644
--- a/gcc/testsuite/gcc.dg/990117-1.c
+++ b/gcc/testsuite/gcc.target/i386/990117-1.c
diff --git a/gcc/testsuite/gcc.dg/990130-1.c b/gcc/testsuite/gcc.target/i386/990130-1.c
index 57e046b22a6..57e046b22a6 100644
--- a/gcc/testsuite/gcc.dg/990130-1.c
+++ b/gcc/testsuite/gcc.target/i386/990130-1.c
diff --git a/gcc/testsuite/gcc.dg/990213-2.c b/gcc/testsuite/gcc.target/i386/990213-2.c
index d095e3723f9..d095e3723f9 100644
--- a/gcc/testsuite/gcc.dg/990213-2.c
+++ b/gcc/testsuite/gcc.target/i386/990213-2.c
diff --git a/gcc/testsuite/gcc.dg/990214-1.c b/gcc/testsuite/gcc.target/i386/990214-1.c
index b3cb519a471..b3cb519a471 100644
--- a/gcc/testsuite/gcc.dg/990214-1.c
+++ b/gcc/testsuite/gcc.target/i386/990214-1.c
diff --git a/gcc/testsuite/gcc.dg/990424-1.c b/gcc/testsuite/gcc.target/i386/990424-1.c
index 5b5af818076..5b5af818076 100644
--- a/gcc/testsuite/gcc.dg/990424-1.c
+++ b/gcc/testsuite/gcc.target/i386/990424-1.c
diff --git a/gcc/testsuite/gcc.dg/990524-1.c b/gcc/testsuite/gcc.target/i386/990524-1.c
index ee4ebd62671..ee4ebd62671 100644
--- a/gcc/testsuite/gcc.dg/990524-1.c
+++ b/gcc/testsuite/gcc.target/i386/990524-1.c
diff --git a/gcc/testsuite/gcc.dg/991129-1.c b/gcc/testsuite/gcc.target/i386/991129-1.c
index 489b7f987fa..489b7f987fa 100644
--- a/gcc/testsuite/gcc.dg/991129-1.c
+++ b/gcc/testsuite/gcc.target/i386/991129-1.c
diff --git a/gcc/testsuite/gcc.dg/991209-1.c b/gcc/testsuite/gcc.target/i386/991209-1.c
index ab455da098d..ab455da098d 100644
--- a/gcc/testsuite/gcc.dg/991209-1.c
+++ b/gcc/testsuite/gcc.target/i386/991209-1.c
diff --git a/gcc/testsuite/gcc.dg/991214-1.c b/gcc/testsuite/gcc.target/i386/991214-1.c
index cfe3a9a4121..cfe3a9a4121 100644
--- a/gcc/testsuite/gcc.dg/991214-1.c
+++ b/gcc/testsuite/gcc.target/i386/991214-1.c
diff --git a/gcc/testsuite/gcc.dg/991230-1.c b/gcc/testsuite/gcc.target/i386/991230-1.c
index b87d0e2e3cb..b87d0e2e3cb 100644
--- a/gcc/testsuite/gcc.dg/991230-1.c
+++ b/gcc/testsuite/gcc.target/i386/991230-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-asm-2.c b/gcc/testsuite/gcc.target/i386/asm-2.c
index 7e9ecb7797d..7e9ecb7797d 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-2.c
+++ b/gcc/testsuite/gcc.target/i386/asm-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-asm-3.c b/gcc/testsuite/gcc.target/i386/asm-3.c
index 19bf1534521..19bf1534521 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-3.c
+++ b/gcc/testsuite/gcc.target/i386/asm-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-asm-4.c b/gcc/testsuite/gcc.target/i386/asm-4.c
index c1324388dae..c1324388dae 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-4.c
+++ b/gcc/testsuite/gcc.target/i386/asm-4.c
diff --git a/gcc/testsuite/gcc.dg/i386-asm-1.c b/gcc/testsuite/gcc.target/i386/asm-5.c
index e871dd9343f..e871dd9343f 100644
--- a/gcc/testsuite/gcc.dg/i386-asm-1.c
+++ b/gcc/testsuite/gcc.target/i386/asm-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield1.c b/gcc/testsuite/gcc.target/i386/bitfield1.c
index e285ba0526a..e285ba0526a 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield1.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield1.c
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield2.c b/gcc/testsuite/gcc.target/i386/bitfield2.c
index 54f5c8dbfd3..54f5c8dbfd3 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield2.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield2.c
diff --git a/gcc/testsuite/gcc.dg/i386-bitfield3.c b/gcc/testsuite/gcc.target/i386/bitfield3.c
index 111f5f28c42..111f5f28c42 100644
--- a/gcc/testsuite/gcc.dg/i386-bitfield3.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield3.c
diff --git a/gcc/testsuite/gcc.dg/i386-cadd.c b/gcc/testsuite/gcc.target/i386/cadd.c
index 2c6360b946b..2c6360b946b 100644
--- a/gcc/testsuite/gcc.dg/i386-cadd.c
+++ b/gcc/testsuite/gcc.target/i386/cadd.c
diff --git a/gcc/testsuite/gcc.dg/i386-call-1.c b/gcc/testsuite/gcc.target/i386/call-1.c
index 3c3d642babd..3c3d642babd 100644
--- a/gcc/testsuite/gcc.dg/i386-call-1.c
+++ b/gcc/testsuite/gcc.target/i386/call-1.c
diff --git a/gcc/testsuite/gcc.dg/clobbers.c b/gcc/testsuite/gcc.target/i386/clobbers.c
index 44c46b0bf02..44c46b0bf02 100644
--- a/gcc/testsuite/gcc.dg/clobbers.c
+++ b/gcc/testsuite/gcc.target/i386/clobbers.c
diff --git a/gcc/testsuite/gcc.dg/i386-cmov1.c b/gcc/testsuite/gcc.target/i386/cmov1.c
index 71f03ae9fea..71f03ae9fea 100644
--- a/gcc/testsuite/gcc.dg/i386-cmov1.c
+++ b/gcc/testsuite/gcc.target/i386/cmov1.c
diff --git a/gcc/testsuite/gcc.dg/i386-cmov2.c b/gcc/testsuite/gcc.target/i386/cmov2.c
index cd6457f0d5f..cd6457f0d5f 100644
--- a/gcc/testsuite/gcc.dg/i386-cmov2.c
+++ b/gcc/testsuite/gcc.target/i386/cmov2.c
diff --git a/gcc/testsuite/gcc.dg/i386-cmov3.c b/gcc/testsuite/gcc.target/i386/cmov3.c
index 6ef2675297d..6ef2675297d 100644
--- a/gcc/testsuite/gcc.dg/i386-cmov3.c
+++ b/gcc/testsuite/gcc.target/i386/cmov3.c
diff --git a/gcc/testsuite/gcc.dg/i386-cmov4.c b/gcc/testsuite/gcc.target/i386/cmov4.c
index e293b34abc1..e293b34abc1 100644
--- a/gcc/testsuite/gcc.dg/i386-cmov4.c
+++ b/gcc/testsuite/gcc.target/i386/cmov4.c
diff --git a/gcc/testsuite/gcc.dg/i386-cmov5.c b/gcc/testsuite/gcc.target/i386/cmov5.c
index 112a9933bbc..112a9933bbc 100644
--- a/gcc/testsuite/gcc.dg/i386-cmov5.c
+++ b/gcc/testsuite/gcc.target/i386/cmov5.c
diff --git a/gcc/testsuite/gcc.dg/i386-cvt-1.c b/gcc/testsuite/gcc.target/i386/cvt-1.c
index d2456f60189..d2456f60189 100644
--- a/gcc/testsuite/gcc.dg/i386-cvt-1.c
+++ b/gcc/testsuite/gcc.target/i386/cvt-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-fastcall-1.c b/gcc/testsuite/gcc.target/i386/fastcall-1.c
index c286ed3aec7..c286ed3aec7 100644
--- a/gcc/testsuite/gcc.dg/i386-fastcall-1.c
+++ b/gcc/testsuite/gcc.target/i386/fastcall-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-fpcvt-1.c b/gcc/testsuite/gcc.target/i386/fpcvt-1.c
index 6e65b104163..6e65b104163 100644
--- a/gcc/testsuite/gcc.dg/i386-fpcvt-1.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-fpcvt-2.c b/gcc/testsuite/gcc.target/i386/fpcvt-2.c
index 613c2076019..613c2076019 100644
--- a/gcc/testsuite/gcc.dg/i386-fpcvt-2.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-fpcvt-3.c b/gcc/testsuite/gcc.target/i386/fpcvt-3.c
index f47cd70ed9a..f47cd70ed9a 100644
--- a/gcc/testsuite/gcc.dg/i386-fpcvt-3.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-fpcvt-4.c b/gcc/testsuite/gcc.target/i386/fpcvt-4.c
index 9b35c5acc6c..9b35c5acc6c 100644
--- a/gcc/testsuite/gcc.dg/i386-fpcvt-4.c
+++ b/gcc/testsuite/gcc.target/i386/fpcvt-4.c
diff --git a/gcc/testsuite/gcc.dg/i386-lea.c b/gcc/testsuite/gcc.target/i386/lea.c
index 61d9955f3e2..61d9955f3e2 100644
--- a/gcc/testsuite/gcc.dg/i386-lea.c
+++ b/gcc/testsuite/gcc.target/i386/lea.c
diff --git a/gcc/testsuite/gcc.dg/i386-local.c b/gcc/testsuite/gcc.target/i386/local.c
index 2fda2a2fc99..2fda2a2fc99 100644
--- a/gcc/testsuite/gcc.dg/i386-local.c
+++ b/gcc/testsuite/gcc.target/i386/local.c
diff --git a/gcc/testsuite/gcc.dg/i386-local2.c b/gcc/testsuite/gcc.target/i386/local2.c
index 2225aeea0d9..2225aeea0d9 100644
--- a/gcc/testsuite/gcc.dg/i386-local2.c
+++ b/gcc/testsuite/gcc.target/i386/local2.c
diff --git a/gcc/testsuite/gcc.dg/i386-loop-1.c b/gcc/testsuite/gcc.target/i386/loop-1.c
index 479c80a2d7a..479c80a2d7a 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-1.c
+++ b/gcc/testsuite/gcc.target/i386/loop-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-loop-2.c b/gcc/testsuite/gcc.target/i386/loop-2.c
index 8994eada46e..8994eada46e 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-2.c
+++ b/gcc/testsuite/gcc.target/i386/loop-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-loop-3.c b/gcc/testsuite/gcc.target/i386/loop-3.c
index 4e046b28acb..4e046b28acb 100644
--- a/gcc/testsuite/gcc.dg/i386-loop-3.c
+++ b/gcc/testsuite/gcc.target/i386/loop-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-memset-1.c b/gcc/testsuite/gcc.target/i386/memset-1.c
index 4da21b97ee0..4da21b97ee0 100644
--- a/gcc/testsuite/gcc.dg/i386-memset-1.c
+++ b/gcc/testsuite/gcc.target/i386/memset-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-1.c b/gcc/testsuite/gcc.target/i386/mmx-1.c
index a658909853c..a658909853c 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-1.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-2.c b/gcc/testsuite/gcc.target/i386/mmx-2.c
index 0c38579f893..0c38579f893 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-2.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-3.c b/gcc/testsuite/gcc.target/i386/mmx-3.c
index d4d61095c8a..d4d61095c8a 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-3.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-4.c b/gcc/testsuite/gcc.target/i386/mmx-4.c
index 071baf7860c..252ba10e6a9 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-4.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-4.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 #ifndef NOINLINE
 #define NOINLINE __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-5.c b/gcc/testsuite/gcc.target/i386/mmx-5.c
index 6021825a47d..6021825a47d 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-5.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-mmx-6.c b/gcc/testsuite/gcc.target/i386/mmx-6.c
index 8938d2cd41d..8938d2cd41d 100644
--- a/gcc/testsuite/gcc.dg/i386-mmx-6.c
+++ b/gcc/testsuite/gcc.target/i386/mmx-6.c
diff --git a/gcc/testsuite/gcc.dg/i386-mul.c b/gcc/testsuite/gcc.target/i386/mul.c
index 2a864af76d0..2a864af76d0 100644
--- a/gcc/testsuite/gcc.dg/i386-mul.c
+++ b/gcc/testsuite/gcc.target/i386/mul.c
diff --git a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c b/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c
index 2ae7512cb48..2ae7512cb48 100644
--- a/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
+++ b/gcc/testsuite/gcc.target/i386/pentium4-not-mull.c
diff --git a/gcc/testsuite/gcc.dg/i386-pic-1.c b/gcc/testsuite/gcc.target/i386/pic-1.c
index 7762230c2f6..7762230c2f6 100644
--- a/gcc/testsuite/gcc.dg/i386-pic-1.c
+++ b/gcc/testsuite/gcc.target/i386/pic-1.c
diff --git a/gcc/testsuite/gcc.dg/pr12092-1.c b/gcc/testsuite/gcc.target/i386/pr12092-1.c
index 80c7546d9fb..80c7546d9fb 100644
--- a/gcc/testsuite/gcc.dg/pr12092-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr12092-1.c
diff --git a/gcc/testsuite/gcc.dg/pr14289-1.c b/gcc/testsuite/gcc.target/i386/pr14289-1.c
index 71317d542c7..71317d542c7 100644
--- a/gcc/testsuite/gcc.dg/pr14289-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr14289-1.c
diff --git a/gcc/testsuite/gcc.dg/pr18614-1.c b/gcc/testsuite/gcc.target/i386/pr18614-1.c
index db1870cb733..db1870cb733 100644
--- a/gcc/testsuite/gcc.dg/pr18614-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr18614-1.c
diff --git a/gcc/testsuite/gcc.dg/pr19236-1.c b/gcc/testsuite/gcc.target/i386/pr19236-1.c
index 73b75384384..73b75384384 100644
--- a/gcc/testsuite/gcc.dg/pr19236-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr19236-1.c
diff --git a/gcc/testsuite/gcc.dg/pr20204.c b/gcc/testsuite/gcc.target/i386/pr20204.c
index 7f24abc5529..7f24abc5529 100644
--- a/gcc/testsuite/gcc.dg/pr20204.c
+++ b/gcc/testsuite/gcc.target/i386/pr20204.c
diff --git a/gcc/testsuite/gcc.target/x86_64/pr23376.c b/gcc/testsuite/gcc.target/i386/pr23376.c
index ba60399f957..ba60399f957 100644
--- a/gcc/testsuite/gcc.target/x86_64/pr23376.c
+++ b/gcc/testsuite/gcc.target/i386/pr23376.c
diff --git a/gcc/testsuite/gcc.dg/pr23943.c b/gcc/testsuite/gcc.target/i386/pr23943.c
index f0e60bf84d7..f0e60bf84d7 100644
--- a/gcc/testsuite/gcc.dg/pr23943.c
+++ b/gcc/testsuite/gcc.target/i386/pr23943.c
diff --git a/gcc/testsuite/gcc.dg/pr9771-1.c b/gcc/testsuite/gcc.target/i386/pr9771-1.c
index 30e42de60b1..30e42de60b1 100644
--- a/gcc/testsuite/gcc.dg/pr9771-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr9771-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-regparm.c b/gcc/testsuite/gcc.target/i386/regparm.c
index e3cd8b090ff..e3cd8b090ff 100644
--- a/gcc/testsuite/gcc.dg/i386-regparm.c
+++ b/gcc/testsuite/gcc.target/i386/regparm.c
diff --git a/gcc/testsuite/gcc.dg/i386-rotate-1.c b/gcc/testsuite/gcc.target/i386/rotate-1.c
index 0b9ae5a8c13..0b9ae5a8c13 100644
--- a/gcc/testsuite/gcc.dg/i386-rotate-1.c
+++ b/gcc/testsuite/gcc.target/i386/rotate-1.c
diff --git a/gcc/testsuite/gcc.dg/sibcall-5.c b/gcc/testsuite/gcc.target/i386/sibcall-5.c
index d94750099fe..d94750099fe 100644
--- a/gcc/testsuite/gcc.dg/sibcall-5.c
+++ b/gcc/testsuite/gcc.target/i386/sibcall-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-1.c b/gcc/testsuite/gcc.target/i386/signbit-1.c
index adb351a2772..adb351a2772 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-1.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-2.c b/gcc/testsuite/gcc.target/i386/signbit-2.c
index 8ca63965062..8ca63965062 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-2.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-signbit-3.c b/gcc/testsuite/gcc.target/i386/signbit-3.c
index a08ca498142..a08ca498142 100644
--- a/gcc/testsuite/gcc.dg/i386-signbit-3.c
+++ b/gcc/testsuite/gcc.target/i386/signbit-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-10.c b/gcc/testsuite/gcc.target/i386/sse-10.c
index e15b3b89d1f..8c0f28ff8d6 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-10.c
+++ b/gcc/testsuite/gcc.target/i386/sse-10.c
@@ -2,7 +2,7 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O1 -msse2 -mfpmath=sse -mno-accumulate-outgoing-args -fno-omit-frame-pointer" } */
 
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 typedef _Complex double complex_16;
 
diff --git a/gcc/testsuite/gcc.dg/i386-sse-11.c b/gcc/testsuite/gcc.target/i386/sse-11.c
index fd72047b525..3ec5e7bb124 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-11.c
+++ b/gcc/testsuite/gcc.target/i386/sse-11.c
@@ -2,7 +2,7 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -msse2" } */
 #include <emmintrin.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.dg/i386-sse-12.c b/gcc/testsuite/gcc.target/i386/sse-12.c
index 83cc91588cf..83cc91588cf 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-12.c
+++ b/gcc/testsuite/gcc.target/i386/sse-12.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-1.c b/gcc/testsuite/gcc.target/i386/sse-13.c
index 1f657e1f273..1f657e1f273 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-1.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-2.c b/gcc/testsuite/gcc.target/i386/sse-14.c
index 38e4e56acbe..38e4e56acbe 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse-14.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-3.c b/gcc/testsuite/gcc.target/i386/sse-15.c
index 9f31cfa92f8..9f31cfa92f8 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse-15.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-4.c b/gcc/testsuite/gcc.target/i386/sse-16.c
index 7f6d817f4d6..7f6d817f4d6 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-4.c
+++ b/gcc/testsuite/gcc.target/i386/sse-16.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-5.c b/gcc/testsuite/gcc.target/i386/sse-5.c
index ced075ae97d..ced075ae97d 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-5.c
+++ b/gcc/testsuite/gcc.target/i386/sse-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-6.c b/gcc/testsuite/gcc.target/i386/sse-6.c
index 6642891485b..26932968aad 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-6.c
+++ b/gcc/testsuite/gcc.target/i386/sse-6.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 #ifndef NOINLINE
 #define NOINLINE __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.dg/i386-sse-7.c b/gcc/testsuite/gcc.target/i386/sse-7.c
index 62e06e94ac8..3d4d1ec45fa 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-7.c
+++ b/gcc/testsuite/gcc.target/i386/sse-7.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 #ifndef NOINLINE
 #define NOINLINE __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.dg/i386-sse-8.c b/gcc/testsuite/gcc.target/i386/sse-8.c
index ec3acc16906..ec3acc16906 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-8.c
+++ b/gcc/testsuite/gcc.target/i386/sse-8.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-9.c b/gcc/testsuite/gcc.target/i386/sse-9.c
index 1fe7adac542..1fe7adac542 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-9.c
+++ b/gcc/testsuite/gcc.target/i386/sse-9.c
diff --git a/gcc/testsuite/gcc.dg/i386-sse-vect-types.c b/gcc/testsuite/gcc.target/i386/sse-vect-types.c
index 10a544d627b..10a544d627b 100644
--- a/gcc/testsuite/gcc.dg/i386-sse-vect-types.c
+++ b/gcc/testsuite/gcc.target/i386/sse-vect-types.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-1.c b/gcc/testsuite/gcc.target/i386/ssefn-1.c
index 548c580571f..548c580571f 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-2.c b/gcc/testsuite/gcc.target/i386/ssefn-2.c
index ded8b724f94..ded8b724f94 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-3.c b/gcc/testsuite/gcc.target/i386/ssefn-3.c
index c1b61301f34..925365a8007 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-3.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-3.c
@@ -4,7 +4,7 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -msse -mfpmath=sse" } */
 #include <assert.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 static float xs (void)
 {
diff --git a/gcc/testsuite/gcc.dg/i386-ssefn-4.c b/gcc/testsuite/gcc.target/i386/ssefn-4.c
index a28382e2826..5547129e8c5 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefn-4.c
+++ b/gcc/testsuite/gcc.target/i386/ssefn-4.c
@@ -4,7 +4,7 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -msse2 -mfpmath=sse" } */
 #include <assert.h>
-#include "i386-cpuid.h"
+#include "../../gcc.dg/i386-cpuid.h"
 
 static float xs (void)
 {
diff --git a/gcc/testsuite/gcc.dg/i386-ssefp-1.c b/gcc/testsuite/gcc.target/i386/ssefp-1.c
index d11a72f1118..d11a72f1118 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefp-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssefp-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssefp-2.c b/gcc/testsuite/gcc.target/i386/ssefp-2.c
index 68790241678..68790241678 100644
--- a/gcc/testsuite/gcc.dg/i386-ssefp-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssefp-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-1.c b/gcc/testsuite/gcc.target/i386/ssetype-1.c
index 50d0fcaa58a..50d0fcaa58a 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-1.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-2.c b/gcc/testsuite/gcc.target/i386/ssetype-2.c
index eb57dac7813..eb57dac7813 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-2.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-2.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-3.c b/gcc/testsuite/gcc.target/i386/ssetype-3.c
index 3b2461be32c..3b2461be32c 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-3.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-3.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-4.c b/gcc/testsuite/gcc.target/i386/ssetype-4.c
index e9d989ba974..e9d989ba974 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-4.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-4.c
diff --git a/gcc/testsuite/gcc.dg/i386-ssetype-5.c b/gcc/testsuite/gcc.target/i386/ssetype-5.c
index 866c4d3d577..866c4d3d577 100644
--- a/gcc/testsuite/gcc.dg/i386-ssetype-5.c
+++ b/gcc/testsuite/gcc.target/i386/ssetype-5.c
diff --git a/gcc/testsuite/gcc.dg/i386-unroll-1.c b/gcc/testsuite/gcc.target/i386/unroll-1.c
index e681474725a..e681474725a 100644
--- a/gcc/testsuite/gcc.dg/i386-unroll-1.c
+++ b/gcc/testsuite/gcc.target/i386/unroll-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-volatile-1.c b/gcc/testsuite/gcc.target/i386/volatile-1.c
index 8a37df48b20..8a37df48b20 100644
--- a/gcc/testsuite/gcc.dg/i386-volatile-1.c
+++ b/gcc/testsuite/gcc.target/i386/volatile-1.c
diff --git a/gcc/testsuite/gcc.dg/i386-xorps.c b/gcc/testsuite/gcc.target/i386/xorps.c
index 0cf7532a1b9..0cf7532a1b9 100644
--- a/gcc/testsuite/gcc.dg/i386-xorps.c
+++ b/gcc/testsuite/gcc.target/i386/xorps.c