Re: [PATCH v2] Fix Wundef warning for MEMCPY_OK_FOR_FWD_MEMMOVE

[Siddhesh Poyarekar <siddhesh at redhat dot com>]

... and I forgot to add Chris to cc to bring this to his attention.

Siddhesh

On Fri, Jun 27, 2014 at 10:43:26PM +0530, Siddhesh Poyarekar wrote:
> I've moved the macro definition to memcopy.h with tile overriding the
> definition in its memcopy.h.  This also allows us to get rid of the
> tile-specific memmove.c.  The tile bit is untested, so I'll need Chris
> to verify that it doesn't cause any problems.  The code is unchanged
> on x86_64.
> 
> Siddhesh
> 
> 	* 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.
> 
> diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
> index 49e5363..b39a960 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 e8326ee..b8ea16a 100644
> --- a/sysdeps/tile/memcopy.h
> +++ b/sysdeps/tile/memcopy.h
> @@ -19,6 +19,8 @@
>  #include <sysdeps/generic/memcopy.h>
>  #include <bits/wordsize.h>
>  
> +#undef MEMCPY_OK_FOR_FWD_MEMMOVE
> +#define MEMCPY_OK_FOR_FWD_MEMMOVE 1
>  /* 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 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>

Attachment: pgpLpban_r841.pgp
Description: PGP signature