merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6e9f6937dd72e1c6c4ea96e79aacce5384d5e530..bfffec3f466b24087a117240370eee9df76de9ac 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       PR target/10338
+       PR bootstrap/10198
+       PR bootstrap/10140
+       * getopt.c (exchange, _getopt_initialize): Use mempcpy not
+       __mempcpy.
+       * regex.c (regerror): Likewise.
+
 2003-04-14  Roger Sayle  <roger@eyesopen.com>
 
        * strdup.c (strdup): Tweak implementation to use memcpy.

diff --git a/libiberty/getopt.c b/libiberty/getopt.c
index 2402a39e2f85687cf7a73f36d2a4f3a10940cfa7..a1e482763c1cf9263669e4c1caf4c16cbc283f49 100644 (file)
--- a/libiberty/getopt.c
+++ b/libiberty/getopt.c
@@ -333,8 +333,8 @@ exchange (argv)
        nonoption_flags_len = nonoption_flags_max_len = 0;
       else
        {
-         memset (__mempcpy (new_str, __getopt_nonoption_flags,
-                            nonoption_flags_max_len),
+         memset (mempcpy (new_str, __getopt_nonoption_flags,
+                          nonoption_flags_max_len),
                  '\0', top + 1 - nonoption_flags_max_len);
          nonoption_flags_max_len = top + 1;
          __getopt_nonoption_flags = new_str;
@@ -444,7 +444,7 @@ _getopt_initialize (argc, argv, optstring)
              if (__getopt_nonoption_flags == NULL)
                nonoption_flags_max_len = -1;
              else
-               memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+               memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
                        '\0', nonoption_flags_max_len - len);
            }
        }

diff --git a/libiberty/regex.c b/libiberty/regex.c
index f9d9a4e26dce9b3c73f916b8695564c84398b548..e3439b2ff634d044cc1d1b1ef95f06035b8de910 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -8200,7 +8200,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
       if (msg_size > errbuf_size)
         {
 #if defined HAVE_MEMPCPY || defined _LIBC
-         *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+         *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
 #else
           memcpy (errbuf, msg, errbuf_size - 1);
           errbuf[errbuf_size - 1] = 0;