diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb51c23ea0c..31bfa322316 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,27 @@
+2007-03-12  Richard Sandiford  <richard@codesourcery.com>
+
+	* gcc.c-torture/compile/981006-1.c: Use the non-PIC options if
+	PIC is not supported.
+	* gcc.dg/20020103-1.c: Add dg-require-effective-target fpic.
+	* gcc.dg/20020426-2.c: Likewise.
+	* gcc.dg/pr28243.c: Likewise.
+	* gcc.dg/visibility-11.c: Likewise.
+	* gcc.dg/tls/opt-9.c: Likewise.
+	* gcc.dg/tls/opt-10.c: Likewise.
+	* gcc.dg/tls/pic-1.c: Likewise.
+	* gcc.dg/tls/struct-1.c: Likewise.
+	* gcc.target/i386/20000807-1.c: Likewise.
+	* gcc.target/i386/20000904-1.c: Likewise.
+	* gcc.target/i386/20011119-1.c: Likewise.
+	* gcc.target/i386/990213-2.c: Likewise.
+	* gcc.target/i386/990214-1.c: Likewise.
+	* gcc.target/i386/compress-float-387-pic.c: Likewise.
+	* gcc.target/i386/compress-float-sse-pic.c: Likewise.
+	* gcc.target/i386/pic-1.c: Likewise.
+	* gcc.target/i386/pr21518.c: Likewise.
+	* gcc.target/i386/pr23098.c: Likewise.
+	* gcc.target/i386/pr23943.c: Likewise.
+
 2007-03-11  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/31038
diff --git a/gcc/testsuite/gcc.c-torture/compile/981006-1.c b/gcc/testsuite/gcc.c-torture/compile/981006-1.c
index 718fa881af5..ba59da74e66 100644
--- a/gcc/testsuite/gcc.c-torture/compile/981006-1.c
+++ b/gcc/testsuite/gcc.c-torture/compile/981006-1.c
@@ -6,7 +6,7 @@
 /* { dg-do assemble } */
 /* For MIPS at least, pic is needed to trigger the problem. */
 /* { dg-options "-w -Wuninitialized -Werror -fpic" } */
-/* { dg-options "-w -Wuninitialized -Werror" { target rs6000-*-aix* powerpc*-*-aix* arm*-*-* xscale*-*-* strongarm*-*-* fr30-*-* sh-*-hms sh-*-coff h8300*-*-* cris-*-elf* cris-*-aout* mmix-*-* } } */
+/* { dg-options "-w -Wuninitialized -Werror" { target { { rs6000-*-aix* powerpc*-*-aix* arm*-*-* xscale*-*-* strongarm*-*-* fr30-*-* sh-*-hms sh-*-coff h8300*-*-* cris-*-elf* cris-*-aout* mmix-*-* } || { ! fpic } } } } */
 
 int foo (int a, int b)
 {
diff --git a/gcc/testsuite/gcc.dg/20020103-1.c b/gcc/testsuite/gcc.dg/20020103-1.c
index 776dd3d96d6..3402e8bdfce 100644
--- a/gcc/testsuite/gcc.dg/20020103-1.c
+++ b/gcc/testsuite/gcc.dg/20020103-1.c
@@ -1,6 +1,7 @@
 /* Verify that constant equivalences get reloaded properly, either by being
    spilled to the stack, or regenerated, but not dropped to memory.  */
 /* { dg-do compile { target { { i?86-*-* rs6000-*-* alpha*-*-* x86_64-*-* } || { powerpc*-*-* && ilp32 } } } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fpic -fno-omit-frame-pointer -fno-asynchronous-unwind-tables" } */
 /* { dg-final { scan-assembler-not "LC\[0-9\]" { xfail powerpc*-*-* } } } */
 
diff --git a/gcc/testsuite/gcc.dg/20020426-2.c b/gcc/testsuite/gcc.dg/20020426-2.c
index 095cf51790d..40dd69c2ccc 100644
--- a/gcc/testsuite/gcc.dg/20020426-2.c
+++ b/gcc/testsuite/gcc.dg/20020426-2.c
@@ -3,6 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
 /* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))" "PIC unsupported" { xfail *-*-netware* } 0 } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/pr28243.c b/gcc/testsuite/gcc.dg/pr28243.c
index f74f86e3010..c2797c0fb3f 100644
--- a/gcc/testsuite/gcc.dg/pr28243.c
+++ b/gcc/testsuite/gcc.dg/pr28243.c
@@ -2,6 +2,7 @@
 /* Reported by Mike Frysinger <vapier@gentoo.org> */
 
 /* { dg-do compile } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -ftracer -fPIC" } */
 
 struct displayfuncs {
diff --git a/gcc/testsuite/gcc.dg/tls/opt-10.c b/gcc/testsuite/gcc.dg/tls/opt-10.c
index f31c1fff816..777e585569a 100644
--- a/gcc/testsuite/gcc.dg/tls/opt-10.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-10.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O3 -fpic" } */
 
 /* The web pass was creating unrecognisable pic_load_dot_plus_four insns
diff --git a/gcc/testsuite/gcc.dg/tls/opt-9.c b/gcc/testsuite/gcc.dg/tls/opt-9.c
index 3829c66fc55..4cc16313b1c 100644
--- a/gcc/testsuite/gcc.dg/tls/opt-9.c
+++ b/gcc/testsuite/gcc.dg/tls/opt-9.c
@@ -1,5 +1,6 @@
 /* PR 21412 */
 /* { dg-do compile */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fPIC" } */
 
 struct S { int x[10]; };
diff --git a/gcc/testsuite/gcc.dg/tls/pic-1.c b/gcc/testsuite/gcc.dg/tls/pic-1.c
index f5b020b7db6..f40267c10a3 100644
--- a/gcc/testsuite/gcc.dg/tls/pic-1.c
+++ b/gcc/testsuite/gcc.dg/tls/pic-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fpic -ftls-model=global-dynamic" } */
 
 extern __thread long e1;
diff --git a/gcc/testsuite/gcc.dg/tls/struct-1.c b/gcc/testsuite/gcc.dg/tls/struct-1.c
index 11151236d90..cf931bf9e62 100644
--- a/gcc/testsuite/gcc.dg/tls/struct-1.c
+++ b/gcc/testsuite/gcc.dg/tls/struct-1.c
@@ -1,6 +1,7 @@
 /* This testcase ICEd on IA-32 because the backend was inconsistent whether
    to allow addends for @dtpoff relocs or not.  */
 /* { dg-do compile } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fpic" } */
 
 struct S {
diff --git a/gcc/testsuite/gcc.dg/visibility-11.c b/gcc/testsuite/gcc.dg/visibility-11.c
index 513ce64306e..d616fe9aeec 100644
--- a/gcc/testsuite/gcc.dg/visibility-11.c
+++ b/gcc/testsuite/gcc.dg/visibility-11.c
@@ -5,6 +5,7 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-skip-if "" { *-*-darwin* } { "*" } { "" } } */
 /* { dg-require-visibility "" } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-Os -fpic -mstringop-strategy=libcall" } */
 /* { dg-final { scan-assembler "memcpy@PLT" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/20000807-1.c b/gcc/testsuite/gcc.target/i386/20000807-1.c
index 360e3245989..70b0182b054 100644
--- a/gcc/testsuite/gcc.target/i386/20000807-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000807-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-Os -fpic" } */
 
 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/i386/20000904-1.c b/gcc/testsuite/gcc.target/i386/20000904-1.c
index 31f937cab71..bf00d557d71 100644
--- a/gcc/testsuite/gcc.target/i386/20000904-1.c
+++ b/gcc/testsuite/gcc.target/i386/20000904-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O0 -fpic" } */
 
 static struct {
diff --git a/gcc/testsuite/gcc.target/i386/20011119-1.c b/gcc/testsuite/gcc.target/i386/20011119-1.c
index 4a338570dda..dc724aa60c1 100644
--- a/gcc/testsuite/gcc.target/i386/20011119-1.c
+++ b/gcc/testsuite/gcc.target/i386/20011119-1.c
@@ -1,6 +1,7 @@
 /* Test for reload failing to eliminate from argp to sp.  */
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 /* { dg-skip-if "" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */
 /* { dg-skip-if "PIC default" { "*-*-darwin*" } { "*" } { "" } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
diff --git a/gcc/testsuite/gcc.target/i386/990213-2.c b/gcc/testsuite/gcc.target/i386/990213-2.c
index d095e3723f9..899f3395de3 100644
--- a/gcc/testsuite/gcc.target/i386/990213-2.c
+++ b/gcc/testsuite/gcc.target/i386/990213-2.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
 struct normal_encoding {};
diff --git a/gcc/testsuite/gcc.target/i386/990214-1.c b/gcc/testsuite/gcc.target/i386/990214-1.c
index b3cb519a471..d9e401ddb89 100644
--- a/gcc/testsuite/gcc.target/i386/990214-1.c
+++ b/gcc/testsuite/gcc.target/i386/990214-1.c
@@ -1,4 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
 typedef int int64_t __attribute__ ((__mode__ (  __DI__ ))) ;
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c b/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
index 0673f5d1c8e..bae12ff1710 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-387-pic.c
@@ -1,5 +1,6 @@
 /* { dg-do compile { target i?86*-*-* } } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=387 -fpic" } */
 double foo (double x) {
   return x + 1.75;
diff --git a/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c b/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
index 52cf4637716..4999d207ac9 100644
--- a/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
+++ b/gcc/testsuite/gcc.target/i386/compress-float-sse-pic.c
@@ -1,5 +1,6 @@
 /* { dg-do compile { target i?86*-*-* } } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -march=pentium4 -mtune=prescott -mfpmath=sse -fpic" } */
 double foo (double x) {
   return x + 1.75;
diff --git a/gcc/testsuite/gcc.target/i386/pic-1.c b/gcc/testsuite/gcc.target/i386/pic-1.c
index 7762230c2f6..66a18b099e6 100644
--- a/gcc/testsuite/gcc.target/i386/pic-1.c
+++ b/gcc/testsuite/gcc.target/i386/pic-1.c
@@ -1,6 +1,7 @@
 /* PR target/8340 */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
 int foo ()
diff --git a/gcc/testsuite/gcc.target/i386/pr21518.c b/gcc/testsuite/gcc.target/i386/pr21518.c
index f2ac666071e..b42d9c9f0b3 100644
--- a/gcc/testsuite/gcc.target/i386/pr21518.c
+++ b/gcc/testsuite/gcc.target/i386/pr21518.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fPIC -fno-tree-pre" } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 
 extern void __attribute__ ((regparm (3)))
 drawPointsLines (char type, int first, int *dd);
diff --git a/gcc/testsuite/gcc.target/i386/pr23098.c b/gcc/testsuite/gcc.target/i386/pr23098.c
index 3ff4b6435cc..0f837d242b8 100644
--- a/gcc/testsuite/gcc.target/i386/pr23098.c
+++ b/gcc/testsuite/gcc.target/i386/pr23098.c
@@ -3,6 +3,7 @@
 /* { dg-options "-O2 -fPIC" } */
 /* { dg-final { scan-assembler-not "\.LC\[0-9\]" } } */
 /* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target fpic } */
 
 double foo (float);
 
diff --git a/gcc/testsuite/gcc.target/i386/pr23943.c b/gcc/testsuite/gcc.target/i386/pr23943.c
index 5e4ad9b2112..576cd61c1f9 100644
--- a/gcc/testsuite/gcc.target/i386/pr23943.c
+++ b/gcc/testsuite/gcc.target/i386/pr23943.c
@@ -1,6 +1,7 @@
 /* This used to ICE in side_effects_p, due to a problem in cse.c.
    Origin: marcus at jet dot franken dot de.  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fPIC" } */
 
 typedef long unsigned int size_t;