From patchwork Fri Jun 27 17:13:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1803 Received: (qmail 20529 invoked by alias); 27 Jun 2014 18:15:14 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 20502 invoked by uid 89); 27 Jun 2014 18:15:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Fri, 27 Jun 2014 22:43:26 +0530 From: Siddhesh Poyarekar To: Will Newton Cc: Roland McGrath , libc-alpha Subject: [PATCH v2] Fix Wundef warning for MEMCPY_OK_FOR_FWD_MEMMOVE Message-ID: <20140627171326.GE4477@spoyarek.pnq.redhat.com> References: <20140626185412.GA1826@spoyarek.pnq.redhat.com> <20140626190423.572732C3993@topped-with-meat.com> <20140627092109.GD4477@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) 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 #include +#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 - . */ - -/* The tilegx implementation of memcpy is safe to use for memmove. */ -#define MEMCPY_OK_FOR_FWD_MEMMOVE 1 -#include