From e3045e7a13f85a82a356aedb4ef23c161990c6e5 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <richard@codesourcery.com>
Date: Thu, 8 Mar 2007 16:34:43 +0000
Subject: [PATCH] memmove-lib.c: Include lib/bzero.c and lib/bfill.c on VxWorks
 targets.

gcc/testsuite/
	* gcc.c-torture/execute/builtins/memmove-lib.c: Include lib/bzero.c
	and lib/bfill.c on VxWorks targets.
	* gcc.c-torture/execute/builtins/memmove-2-lib.c: Likewise.
	* gcc.c-torture/execute/builtins/strchr-lib.c: Include lib/bzero.c,
	lib/bfill.c and lib/memmove.c on VxWorks targets.
	* gcc.c-torture/execute/builtins/strrchr-lib.c: Likewise.
	* gcc.c-torture/execute/builtins/memops-asm-lib.c: Include lib/bfill.c
	on VxWorks targets.
	* gcc.c-torture/execute/builtins/lib/bzero.c: New file.
	* gcc.c-torture/execute/builtins/lib/bfill.c: Likewise.

From-SVN: r122701
---
 gcc/testsuite/ChangeLog                           | 13 +++++++++++++
 .../gcc.c-torture/execute/builtins/lib/bfill.c    | 15 +++++++++++++++
 .../gcc.c-torture/execute/builtins/lib/bzero.c    | 15 +++++++++++++++
 .../execute/builtins/memmove-2-lib.c              |  6 ++++++
 .../gcc.c-torture/execute/builtins/memmove-lib.c  |  6 ++++++
 .../execute/builtins/memops-asm-lib.c             |  6 ++++++
 .../gcc.c-torture/execute/builtins/strchr-lib.c   |  7 +++++++
 .../gcc.c-torture/execute/builtins/strrchr-lib.c  |  7 +++++++
 8 files changed, 75 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/builtins/lib/bfill.c
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/builtins/lib/bzero.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cef80b0e2548..e3b49558e469 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2007-03-08  Richard Sandiford  <richard@codesourcery.com>
+
+	* gcc.c-torture/execute/builtins/memmove-lib.c: Include lib/bzero.c
+	and lib/bfill.c on VxWorks targets.
+	* gcc.c-torture/execute/builtins/memmove-2-lib.c: Likewise.
+	* gcc.c-torture/execute/builtins/strchr-lib.c: Include lib/bzero.c,
+	lib/bfill.c and lib/memmove.c on VxWorks targets.
+	* gcc.c-torture/execute/builtins/strrchr-lib.c: Likewise.
+	* gcc.c-torture/execute/builtins/memops-asm-lib.c: Include lib/bfill.c
+	on VxWorks targets.
+	* gcc.c-torture/execute/builtins/lib/bzero.c: New file.
+	* gcc.c-torture/execute/builtins/lib/bfill.c: Likewise.
+
 2007-03-08  Tobias Burnus  <burnus@net-b.de>
 
 	* gfortran.dg/use_5.f90: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bfill.c b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bfill.c
new file mode 100644
index 000000000000..c5e9629bd9bf
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bfill.c
@@ -0,0 +1,15 @@
+extern int inside_main;
+
+void
+bfill (void *s, __SIZE_TYPE__ n, int ch)
+{
+  char *p;
+
+  for (p = s; n-- > 0; p++)
+    *p = ch;
+
+#ifdef __OPTIMIZE__
+  if (inside_main)
+    abort ();
+#endif
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bzero.c b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bzero.c
new file mode 100644
index 000000000000..bcbe3a4383a5
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/lib/bzero.c
@@ -0,0 +1,15 @@
+extern int inside_main;
+
+void
+bzero (void *s, __SIZE_TYPE__ n)
+{
+  char *p;
+
+  for (p = s; n-- > 0; p++)
+    *p = 0;
+
+#ifdef __OPTIMIZE__
+  if (inside_main)
+    abort ();
+#endif
+}
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-2-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-2-lib.c
index 5be3df52fe55..e2293ffc0406 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-2-lib.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-2-lib.c
@@ -1 +1,7 @@
 #include "lib/memmove.c"
+#ifdef __vxworks
+/* The RTP C library uses bzero and bfill, both of which are defined
+   in the same file as bcopy.  */
+#include "lib/bzero.c"
+#include "lib/bfill.c"
+#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-lib.c
index 5be3df52fe55..e2293ffc0406 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-lib.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/memmove-lib.c
@@ -1 +1,7 @@
 #include "lib/memmove.c"
+#ifdef __vxworks
+/* The RTP C library uses bzero and bfill, both of which are defined
+   in the same file as bcopy.  */
+#include "lib/bzero.c"
+#include "lib/bfill.c"
+#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/memops-asm-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/memops-asm-lib.c
index 2edd0ffa7481..eeffe5c08e49 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/memops-asm-lib.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/memops-asm-lib.c
@@ -77,3 +77,9 @@ bzero (void *d, size_t n)
   my_bzero (d, n);
   TEST_ABORT;
 }
+
+#ifdef __vxworks
+/* The RTP C library uses bfill, which is defined in the same file as
+   bzero and bcopy.  */
+#include "lib/bfill.c"
+#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/strchr-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/strchr-lib.c
index 9049fb9e1ffe..b3f0bd237a4e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/strchr-lib.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/strchr-lib.c
@@ -1 +1,8 @@
 #include "lib/strchr.c"
+#ifdef __vxworks
+/* The RTP C library uses bzero, bfill and bcopy, all of which are defined
+   in the same file as index.  */
+#include "lib/bzero.c"
+#include "lib/bfill.c"
+#include "lib/memmove.c"
+#endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtins/strrchr-lib.c b/gcc/testsuite/gcc.c-torture/execute/builtins/strrchr-lib.c
index 90475eca33dc..9194c555f631 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtins/strrchr-lib.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtins/strrchr-lib.c
@@ -1 +1,8 @@
 #include "lib/strrchr.c"
+#ifdef __vxworks
+/* The RTP C library uses bzero, bfill and bcopy, all of which are defined
+   in the same file as rindex.  */
+#include "lib/bzero.c"
+#include "lib/bfill.c"
+#include "lib/memmove.c"
+#endif