diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fda07c36ac0..bace48a419d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-05  Steve Ellcey  <sje@cup.hp.com>
+
+	* lib/target-supports.exp (check_function_available): Use -fno-builtin.
+	* (check_effective_target_mempcpy): New.
+	* gcc.c-torture/execute/pr45636.c: Move this...
+	* gcc.dg/torture/pr45636.c: to here.  Add add dg- directives.
+
 2010-11-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* gcc.target/i386/i386.exp (FLAGS): Remove.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr45636.c b/gcc/testsuite/gcc.dg/torture/pr45636.c
similarity index 95%
rename from gcc/testsuite/gcc.c-torture/execute/pr45636.c
rename to gcc/testsuite/gcc.dg/torture/pr45636.c
index 031c8037ffc..0566de86e16 100644
--- a/gcc/testsuite/gcc.c-torture/execute/pr45636.c
+++ b/gcc/testsuite/gcc.dg/torture/pr45636.c
@@ -1,3 +1,5 @@
+/* { dg-do run } */
+/* { dg-require-effective-target mempcpy } */
 /* PR fortran/45636 */
 
 typedef __SIZE_TYPE__ size_t;
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index f387d7e7233..751c1c51577 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1366,7 +1366,7 @@ proc check_function_available { function } {
 	#endif
 	char $function ();
 	int main () { $function (); }
-    }]]
+    }] "-fno-builtin" ]
 }
 
 # Returns true iff "fork" is available on the target system.
@@ -3741,3 +3741,9 @@ proc check_effective_target_run_expensive_tests { } {
     }
     return 0
 }
+
+# Returns 1 if "mempcpy" is available on the target system.
+
+proc check_effective_target_mempcpy {} {
+    return [check_function_available "mempcpy"]
+}