niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build of C mempcpy and stpcpy.

Browse source 
This patch fixes the build of C mempcpy and stpcpy by disabling the
redirection to __mempcpy and __stpcpy asm names if
NO_MEMPCPY_STPCPY_REDIRECT is defined, and defining that macro in the
relevant source files.

Tested for powerpc32 that the build is fixed.

	* include/string.h [NO_MEMPCPY_STPCPY_REDIRECT] (mempcpy): Do not
	redeclare with asm name.
	[NO_MEMPCPY_STPCPY_REDIRECT] (stpcpy): Likewise.
	* string/mempcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Define before
	including <string.h>.
	* string/stpcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
	* sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
	[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
	[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
	[SHARED && !NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
This commit is contained in:
Joseph Myers 2014-11-14 13:48:39 +00:00
parent bf438382bd
commit c1b0aadcdf
7 changed files with 22 additions and 1 deletions
ChangeLog
include
string.h
string
mempcpy.cstpcpy.c
sysdeps/powerpc
powerpc32/power4/multiarch
mempcpy.c
powerpc64/multiarch
mempcpy.cstpcpy.c

15
ChangeLog
View file

@ -1,3 +1,18 @@
2014-11-14 Joseph Myers <joseph@codesourcery.com>
* include/string.h [NO_MEMPCPY_STPCPY_REDIRECT] (mempcpy): Do not
redeclare with asm name.
[NO_MEMPCPY_STPCPY_REDIRECT] (stpcpy): Likewise.
* string/mempcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Define before
including <string.h>.
* string/stpcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
[SHARED && !NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
2014-11-13 Joseph Myers <joseph@codesourcery.com>
* stdlib/strtol.c (__strtol): Use prototype definition.

3
include/string.h
View file

@ -115,7 +115,8 @@ libc_hidden_builtin_proto (strspn)
libc_hidden_builtin_proto (strstr)
libc_hidden_builtin_proto (ffs)
#if defined NOT_IN_libc || !defined SHARED
#if (defined NOT_IN_libc || !defined SHARED) \
&& !defined NO_MEMPCPY_STPCPY_REDIRECT
/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
__mempcpy and __stpcpy if not inlined. */
extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");

1
string/mempcpy.c
View file

@ -19,6 +19,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef mempcpy

1
string/stpcpy.c
View file

@ -19,6 +19,7 @@
# include <config.h>
#endif
#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef __stpcpy

1
sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
View file

@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"

1
sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
View file

@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"

1
sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
View file

@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#if defined SHARED && !defined NOT_IN_libc
# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"