diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-06-28 06:05:24 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-06-28 06:05:24 +0530 |
| commit | 64df73c2ea0e02f7794ba2f08540a74a9bb198db (patch) | |
| tree | 8bbfce7b964164f7b6115db73129034d023808b1 | |
| parent | f1eafb41fa71cb5d88fbeda3136c9be965eeaa41 (diff) | |
| download | glibc-64df73c2ea0e02f7794ba2f08540a74a9bb198db.tar.gz glibc-64df73c2ea0e02f7794ba2f08540a74a9bb198db.tar.xz glibc-64df73c2ea0e02f7794ba2f08540a74a9bb198db.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/generic/memcopy.h | 2 | ||||
| -rw-r--r-- | sysdeps/tile/memcopy.h | 6 | ||||
| -rw-r--r-- | sysdeps/tile/tilegx/memmove.c | 22 |
4 files changed, 14 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 3582966c46..0f8b5382d9 100644 --- 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 49e53630dd..b39a9608b8 100644 --- 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 e8326eee66..833310115b 100644 --- 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 index 38323cea3d..0000000000 --- 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> |