Fix Wundef warning for MEMCPY_OK_FOR_FWD_MEMMOVE

Define MEMCPY_OK_FOR_FWD_MEMMOVE in memcopy.h and let arch-specific
implementations of that file override the value if necessary.  This
override is only useful for tile and moving this macro to memcopy.h
allows us to remove the tile-specific memmove.c.

diff --git a/ChangeLog b/ChangeLog
index 3582966..0f8b538 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-28  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       * sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE.
+       * sysdeps/tile/memcopy.h: Redefine MEMCPY_OK_FOR_FWD_MEMMOVE.
+       * sysdeps/tile/tilegx/memmove.c: Remove file.
+
 2014-06-27  Joseph Myers  <joseph@codesourcery.com>
 
        * Makeconfig ($(common-objpfx)soversions.mk): Do not generate

diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index 49e5363..b39a960 100644 (file)
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -148,4 +148,6 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t) __THROW;
 /* Threshold value for when to enter the unrolled loops.  */
 #define        OP_T_THRES      16
 
+#define MEMCPY_OK_FOR_FWD_MEMMOVE 0
+
 #endif /* memcopy.h */

diff --git a/sysdeps/tile/memcopy.h b/sysdeps/tile/memcopy.h
index e8326ee..8333101 100644 (file)
--- a/sysdeps/tile/memcopy.h
+++ b/sysdeps/tile/memcopy.h
@@ -19,6 +19,12 @@
 #include <sysdeps/generic/memcopy.h>
 #include <bits/wordsize.h>
 
+/* The tilegx implementation of memcpy is safe to use for memmove.  */
+#ifdef __tilegx__
+# undef MEMCPY_OK_FOR_FWD_MEMMOVE
+# define MEMCPY_OK_FOR_FWD_MEMMOVE 1
+#endif
+
 /* Support more efficient copying on tilegx32, which supports
    long long as a native 64-bit type.  */
 #if defined (__tilegx__) && __WORDSIZE == 32

diff --git a/sysdeps/tile/tilegx/memmove.c b/sysdeps/tile/tilegx/memmove.c
deleted file mode 100644 (file)
index 38323ce..0000000
--- a/sysdeps/tile/tilegx/memmove.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copy memory to memory until the specified number of bytes
-   has been copied.  Overlap is handled correctly.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* The tilegx implementation of memcpy is safe to use for memmove.  */
-#define MEMCPY_OK_FOR_FWD_MEMMOVE 1
-#include <string/memmove.c>