re PR target/10338 ([3.3 regression?] [Cygwin -> tic4x | avr] cross target compilatio...

gcc:
	PR target/10338
	PR bootstrap/10198
	PR bootstrap/10140
	* fixinc/gnu-regex.c (regerror): Use mempcpy not __mempcpy.

libiberty:
	PR target/10338
	PR bootstrap/10198
	PR bootstrap/10140
	* getopt.c (exchange, _getopt_initialize): Use mempcpy not
	__mempcpy.
	* regex.c (regerror): Likewise.

From-SVN: r65634

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cbf5eea019c2939b4115716a2e3372b4ee078f9b..2856bc1683d7c467a728319bf94752b89fcb66f8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       PR target/10338
+       PR bootstrap/10198
+       PR bootstrap/10140
+       * fixinc/gnu-regex.c (regerror): Use mempcpy not __mempcpy.
+
 2003-04-15  J"orn Rennecke <joern.rennecke@superh.com>
 
        * i386.md (abssf2_if+1): Make condition agree with abssf2_1 .

diff --git a/gcc/fixinc/gnu-regex.c b/gcc/fixinc/gnu-regex.c
index 7468cad52697e1bcbbe21852a0fb92b464f7d75c..790f87e4c44d8c583c6d3fde5ad995c94bcbe8bc 100644 (file)
--- a/gcc/fixinc/gnu-regex.c
+++ b/gcc/fixinc/gnu-regex.c
@@ -5720,7 +5720,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;

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6217c8c888a75b1cad9e5c8914e3b49f8fb7bddb..2fde1874a688442abf5b6a5eb03dc47c679823c2 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>
 
        * argv.c: Use ANSI_PROTOTYPES instead of __STDC__.

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;