From 7e2231e759e0cd8ea6e911791513b0a96c2e143f Mon Sep 17 00:00:00 2001
From: Per Bothner <bothner@cygnus.com>
Date: Sun, 20 Sep 1998 23:54:10 +0000
Subject: [PATCH] Makefile.in (LIBS): Link in libiberty.a.

        * Makefile.in (LIBS):  Link in libiberty.a.
        * c-common.c, gcc.c, toplev.c:  Repalce (some) bcopy calls by memcpy.

From-SVN: r22508
---
 gcc/ChangeLog   | 5 +++++
 gcc/Makefile.in | 3 ++-
 gcc/c-common.c  | 2 +-
 gcc/gcc.c       | 6 +++---
 gcc/toplev.c    | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01893e99ebf..82863b5c827 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 21 00:52:12 1998  Per Bothner  <bothner@cygnus.com>
+
+	* Makefile.in (LIBS):  Link in libiberty.a.
+	* c-common.c, gcc.c, toplev.c:  Repalce (some) bcopy calls by memcpy.
+
 Sun Sep 20 23:28:11 1998  Richard Henderson  <rth@cygnus.com>
 
 	* reload1.c (emit_reload_insns): Accept a new arg for the bb.  Use
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f8b0581fd99..45279b00d7f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -547,7 +547,8 @@ HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) $(HOST_PREFIX)$(HOST_ALLOCA) $(HOST_
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(VFPRINTF) $(DOPRINT) $(CLIB)
+LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(VFPRINTF) $(DOPRINT) $(CLIB) \
+	../libiberty/libiberty.a
 
 # Likewise, for use in the tools that must run on this machine
 # even if we are cross-building GCC.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 5879a851286..a79d9d2f2b3 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -270,7 +270,7 @@ combine_strings (strings)
 			? wchar_bytes : 1));
 	  if ((TREE_TYPE (t) == wchar_array_type_node) == wide_flag)
 	    {
-	      bcopy (TREE_STRING_POINTER (t), q, len);
+	      memcpy (q, TREE_STRING_POINTER (t), len);
 	      q += len;
 	    }
 	  else
diff --git a/gcc/gcc.c b/gcc/gcc.c
index f832ae21f03..799f3d7435e 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1884,7 +1884,7 @@ putenv (str)
   /* Add a new environment variable */
   environ = (char **) xmalloc (sizeof (char *) * (num_envs+2));
   *environ = str;
-  bcopy ((char *) old_environ, (char *) (environ + 1),
+  memcpy ((char *) (environ + 1), (char *) old_environ,
 	 sizeof (char *) * (num_envs+1));
 
 #endif	/* VMS */
@@ -4584,8 +4584,8 @@ is_directory (path1, path2, linker)
   /* Construct the path from the two parts.  Ensure the string ends with "/.".
      The resulting path will be a directory even if the given path is a
      symbolic link.  */
-  bcopy (path1, path, len1);
-  bcopy (path2, path + len1, len2);
+  memcpy (path, path1, len1);
+  memcpy (path + len1, path2, len2);
   cp = path + len1 + len2;
   if (cp[-1] != '/' && cp[-1] != DIR_SEPARATOR)
     *cp++ = DIR_SEPARATOR;
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 86cbcf6f64d..cc4d8d08031 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2295,10 +2295,10 @@ push_float_handler (handler, old_handler)
 
   float_handled = 1;
   if (was_handled)
-    bcopy ((char *) float_handler, (char *) old_handler,
+    memcpy ((char *) old_handler, (char *) float_handler,
 	   sizeof (float_handler));
 
-  bcopy ((char *) handler, (char *) float_handler, sizeof (float_handler));
+  memcpy ((char *) float_handler, (char *) handler, sizeof (float_handler));
   return was_handled;
 }
 
-- 
2.30.2