GNU C Library master sources branch master updated. glibc-2.17-222-g170704c

[neleai at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  170704c9ecf838706b59c353bcd3503f8f74bb48 (commit)
      from  c2af38aa768d1c24b24ba1bed473aaee6c2d675e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=170704c9ecf838706b59c353bcd3503f8f74bb48

commit 170704c9ecf838706b59c353bcd3503f8f74bb48
Author: Ondrej Bilka <neleai@seznam.cz>
Date:   Wed Feb 13 12:57:41 2013 +0100

    Call memcpy in generic mempcpy

diff --git a/ChangeLog b/ChangeLog
index ed911fa..ad1b1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-13   OndÅ?ej Bílka  <neleai@seznam.cz>
+
+	* string/mempcpy.c: Implement by calling memcpy.
+
 2013-02-13  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/ieee754/dbl-64/mpexp.c (__mpexp): Remove NFA.
diff --git a/string/mempcpy.c b/string/mempcpy.c
index ba4d1c6..c0d2448 100644
--- a/string/mempcpy.c
+++ b/string/mempcpy.c
@@ -20,48 +20,14 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
-#include <memcopy.h>
-#include <pagecopy.h>
 
 #undef mempcpy
 #undef __mempcpy
 
 void *
-__mempcpy (dstpp, srcpp, len)
-     void *dstpp;
-     const void *srcpp;
-     size_t len;
+__mempcpy (void *dest, const void *src, size_t len)
 {
-  unsigned long int dstp = (long int) dstpp;
-  unsigned long int srcp = (long int) srcpp;
-
-  /* Copy from the beginning to the end.  */
-
-  /* If there not too few bytes to copy, use word copy.  */
-  if (len >= OP_T_THRES)
-    {
-      /* Copy just a few bytes to make DSTP aligned.  */
-      len -= (-dstp) % OPSIZ;
-      BYTE_COPY_FWD (dstp, srcp, (-dstp) % OPSIZ);
-
-      /* Copy whole pages from SRCP to DSTP by virtual address manipulation,
-	 as much as possible.  */
-
-      PAGE_COPY_FWD_MAYBE (dstp, srcp, len, len);
-
-      /* Copy from SRCP to DSTP taking advantage of the known alignment of
-	 DSTP.  Number of bytes remaining is put in the third argument,
-	 i.e. in LEN.  This number may vary from machine to machine.  */
-
-      WORD_COPY_FWD (dstp, srcp, len, len);
-
-      /* Fall out and copy the tail.  */
-    }
-
-  /* There are just a few bytes to copy.  Use byte memory operations.  */
-  BYTE_COPY_FWD (dstp, srcp, len);
-
-  return (void *) dstp;
+  return memcpy (dest, src, len) + len;
 }
 libc_hidden_def (__mempcpy)
 weak_alias (__mempcpy, mempcpy)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    4 ++++
 string/mempcpy.c |   38 ++------------------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources