diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 035358b69f1..e491ea1944e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-14  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* gcc.c-torture/execute/builtins/lib/strcat.c: New.
+	* gcc.c-torture/execute/builtins/string-9-lib.c: New.
+	* gcc.c-torture/execute/builtins/string-9.c: New, from
+	string-opt-9.c.  Adjust for execute/builtins framework.
+	* gcc.c-torture/execute/string-opt-9.c: Delete.
+
 2003-08-12  Mark Mitchell  <mark@codesourcery.com>
 
 	* g++.dg/init/new8.C: Use __SIZE_TYPE__ to get the type of size_t.
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/lib/strcat.c b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/strcat.c
new file mode 100644
index 00000000000..2cced80f5d7
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/strcat.c
@@ -0,0 +1,19 @@
+extern int inside_main;
+extern void abort(void);
+
+char *
+strcat (char *dst, const char *src)
+{
+  char *p = dst;
+  
+#ifdef __OPTIMIZE__
+  if (inside_main)
+    abort ();
+#endif
+
+  while (*p)
+    p++;
+  while ((*p++ = *src++))
+    ;
+  return dst;
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/string-9-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/string-9-lib.c
new file mode 100644
index 00000000000..0a0bbb8865a
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/string-9-lib.c
@@ -0,0 +1 @@
+#include "lib/strcat.c"
diff --git a/gcc/testsuite/gcc.c-torture/execute/string-opt-9.c b/gcc/testsuite/gcc.c-torture/execute/builtins/string-9.c
similarity index 84%
rename from gcc/testsuite/gcc.c-torture/execute/string-opt-9.c
rename to gcc/testsuite/gcc.c-torture/execute/builtins/string-9.c
index 0c21957f286..ba70c397724 100644
--- a/gcc/testsuite/gcc.c-torture/execute/string-opt-9.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/string-9.c
@@ -5,6 +5,7 @@
 
    Written by Kaveh R. Ghazi, 11/27/2000.  */
 
+extern int inside_main;
 extern void abort (void);
 typedef __SIZE_TYPE__ size_t;
 extern char *strcat (char *, const char *);
@@ -15,7 +16,7 @@ extern int memcmp (const void *, const void *, size_t);
 #define RESET_DST_WITH(FILLER) \
   do { memset (dst, 'X', sizeof (dst)); strcpy (dst, (FILLER)); } while (0)
 
-int main ()
+void main_test (void)
 {
   const char *const s1 = "hello world";
   const char *const s2 = "";
@@ -38,6 +39,13 @@ int main ()
     abort();
 
 #ifndef __OPTIMIZE_SIZE__
+# if !defined __i386__ && !defined __x86_64__
+  /* The functions below might not be optimized into direct stores on all
+     arches.  It depends on how many instructions would be generated and
+     what limits the architecture chooses in STORE_BY_PIECES_P.  */
+  inside_main = 0;
+# endif
+
   RESET_DST_WITH (s1);
   if (strcat (dst, " 1111") != dst
       || memcmp (dst, "hello world 1111\0XXX", 20))
@@ -58,6 +66,9 @@ int main ()
 				  "is "), "a "), "test"), ".");
   if (memcmp (dst, "hello world: this is a test.\0X", 30))
     abort();
+
+  /* Set inside_main again.  */
+  inside_main = 1;
 #endif
 
   /* Test at least one instance of the __builtin_ style.  We do this
@@ -65,18 +76,4 @@ int main ()
   RESET_DST_WITH (s1);
   if (__builtin_strcat (dst, "") != dst || strcmp (dst, s1))
     abort();
-
-  return 0;
 }
-
-#ifdef __OPTIMIZE__
-/* When optimizing, all the above cases should be transformed into
-   something else.  So any remaining calls to the original function
-   should abort.  */
-__attribute__ ((noinline))
-static char *
-strcat (char *s1, const char *s2)
-{
-  abort();
-}
-#endif