texinfo/gnulib lib/Makefile.am m4/gnulib-cache....

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/14 16:09:04

Modified files:
        gnulib/lib     : Makefile.am 
        gnulib/m4      : gnulib-cache.m4 gnulib-comp.m4 
Removed files:
        gnulib/lib     : memcpy.c memmove.c 
        gnulib/m4      : memcpy.m4 memmove.m4 

Log message:
        gnulib claims memcpy and memmove are obsolete; guess we will see

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/Makefile.am?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/memcpy.c?cvsroot=texinfo&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/lib/memmove.c?cvsroot=texinfo&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/gnulib-cache.m4?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/gnulib-comp.m4?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/memcpy.m4?cvsroot=texinfo&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/gnulib/m4/memmove.m4?cvsroot=texinfo&r1=1.5&r2=0

Patches:
Index: lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- lib/Makefile.am     13 Oct 2011 17:41:12 -0000      1.45
+++ lib/Makefile.am     14 Oct 2011 16:09:03 -0000      1.46
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu 
--source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --no-conditional-dependencies --no-libtool 
--macro-prefix=gl --no-vc-files argz getopt gettext mbchar mbiter mbscasecmp 
mbschr mbslen mbsncasecmp mbsstr mbswidth memcpy memmem memmove mkstemp strdup 
strerror xalloc xsetenv
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu 
--source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --no-conditional-dependencies --no-libtool 
--macro-prefix=gl --no-vc-files argz getopt gettext mbchar mbiter mbscasecmp 
mbschr mbslen mbsncasecmp mbsstr mbswidth memmem mkstemp strdup strerror xalloc 
xsetenv
 
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 
@@ -490,15 +490,6 @@
 
 ## end   gnulib module memchr
 
-## begin gnulib module memcpy
-
-
-EXTRA_DIST += memcpy.c
-
-EXTRA_libgnu_a_SOURCES += memcpy.c
-
-## end   gnulib module memcpy
-
 ## begin gnulib module memmem-simple
 
 
@@ -508,15 +499,6 @@
 
 ## end   gnulib module memmem-simple
 
-## begin gnulib module memmove
-
-
-EXTRA_DIST += memmove.c
-
-EXTRA_libgnu_a_SOURCES += memmove.c
-
-## end   gnulib module memmove
-
 ## begin gnulib module mempcpy
 
 

Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-cache.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- m4/gnulib-cache.m4  13 Oct 2011 17:41:25 -0000      1.18
+++ m4/gnulib-cache.m4  14 Oct 2011 16:09:04 -0000      1.19
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib 
--m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argz 
getopt gettext mbchar mbiter mbscasecmp mbschr mbslen mbsncasecmp mbsstr 
mbswidth memcpy memmem memmove mkstemp strdup strerror xalloc xsetenv
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib 
--m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux 
--no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files argz 
getopt gettext mbchar mbiter mbscasecmp mbschr mbslen mbsncasecmp mbsstr 
mbswidth memmem mkstemp strdup strerror xalloc xsetenv
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -43,9 +43,7 @@
   mbsncasecmp
   mbsstr
   mbswidth
-  memcpy
   memmem
-  memmove
   mkstemp
   strdup
   strerror

Index: m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- m4/gnulib-comp.m4   13 Oct 2011 17:41:25 -0000      1.41
+++ m4/gnulib-comp.m4   14 Oct 2011 16:09:04 -0000      1.42
@@ -78,10 +78,8 @@
   # Code from module mbswidth:
   # Code from module mbuiter:
   # Code from module memchr:
-  # Code from module memcpy:
   # Code from module memmem:
   # Code from module memmem-simple:
-  # Code from module memmove:
   # Code from module mempcpy:
   # Code from module mkstemp:
   # Code from module msvc-inval:
@@ -235,11 +233,6 @@
   gl_PREREQ_MEMCHR
 fi
 gl_STRING_MODULE_INDICATOR([memchr])
-gl_FUNC_MEMCPY
-if test $ac_cv_func_memcpy = no; then
-  AC_LIBOBJ([memcpy])
-  gl_PREREQ_MEMCPY
-fi
 gl_FUNC_MEMMEM
 if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
   AC_LIBOBJ([memmem])
@@ -249,11 +242,6 @@
   AC_LIBOBJ([memmem])
 fi
 gl_STRING_MODULE_INDICATOR([memmem])
-gl_FUNC_MEMMOVE
-if test $ac_cv_func_memmove = no; then
-  AC_LIBOBJ([memmove])
-  gl_PREREQ_MEMMOVE
-fi
 gl_FUNC_MEMPCPY
 if test $HAVE_MEMPCPY = 0; then
   AC_LIBOBJ([mempcpy])
@@ -546,9 +534,7 @@
   lib/mbuiter.h
   lib/memchr.c
   lib/memchr.valgrind
-  lib/memcpy.c
   lib/memmem.c
-  lib/memmove.c
   lib/mempcpy.c
   lib/mkstemp.c
   lib/msvc-inval.c
@@ -650,9 +636,7 @@
   m4/mbstate_t.m4
   m4/mbswidth.m4
   m4/memchr.m4
-  m4/memcpy.m4
   m4/memmem.m4
-  m4/memmove.m4
   m4/mempcpy.m4
   m4/mkstemp.m4
   m4/mmap-anon.m4

Index: lib/memcpy.c
===================================================================
RCS file: lib/memcpy.c
diff -N lib/memcpy.c
--- lib/memcpy.c        5 Feb 2011 19:06:03 -0000       1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-/* Copyright (C) 1995, 1997, 2000, 2003, 2006, 2009-2011 Free Software
- * Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Written by Jim Meyering <address@hidden>.  */
-
-#include <config.h>
-
-#include <stddef.h>
-
-/* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
-   if the source overlaps with the destination.
-   Return DESTADDR. */
-
-void *
-memcpy (void *destaddr, void const *srcaddr, size_t len)
-{
-  char *dest = destaddr;
-  char const *src = srcaddr;
-
-  while (len-- > 0)
-    *dest++ = *src++;
-  return destaddr;
-}

Index: lib/memmove.c
===================================================================
RCS file: lib/memmove.c
diff -N lib/memmove.c
--- lib/memmove.c       2 May 2010 18:48:00 -0000       1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-/* memmove.c -- copy memory.
-   Copy LENGTH bytes from SOURCE to DEST.  Does not null-terminate.
-   In the public domain.
-   By David MacKenzie <address@hidden>.  */
-
-#include <config.h>
-
-#include <stddef.h>
-
-void *
-memmove (void *dest0, void const *source0, size_t length)
-{
-  char *dest = dest0;
-  char const *source = source0;
-  if (source < dest)
-    /* Moving from low mem to hi mem; start at end.  */
-    for (source += length, dest += length; length; --length)
-      *--dest = *--source;
-  else if (source != dest)
-    {
-      /* Moving from hi mem to low mem; start at beginning.  */
-      for (; length; --length)
-        *dest++ = *source++;
-    }
-  return dest0;
-}

Index: m4/memcpy.m4
===================================================================
RCS file: m4/memcpy.m4
diff -N m4/memcpy.m4
--- m4/memcpy.m4        13 Oct 2011 17:41:31 -0000      1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-# memcpy.m4 serial 4
-dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_MEMCPY],
-[
-  AC_CHECK_FUNCS([memcpy])
-])
-
-# Prerequisites of lib/memcpy.c.
-AC_DEFUN([gl_PREREQ_MEMCPY], [
-  :
-])

Index: m4/memmove.m4
===================================================================
RCS file: m4/memmove.m4
diff -N m4/memmove.m4
--- m4/memmove.m4       13 Oct 2011 17:41:31 -0000      1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-# memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_FUNC_MEMMOVE],
-[
-  AC_CHECK_FUNCS([memmove])
-])
-
-# Prerequisites of lib/memmove.c.
-AC_DEFUN([gl_PREREQ_MEMMOVE], [
-  :
-])