Skip to content

Commit

Permalink
PowerPC: Fix optimized strncat strlen call
Browse files Browse the repository at this point in the history
This patch fixes the optimized ppc64/power7 strncat strlen call for
static build without ifunc enabled.  The strlen symbol to call in such
situation is just strlen, instead of __GI_strlen (since the __GI_
alias is just created for shared objects).
  • Loading branch information
Adhemerval Zanella committed Jun 6, 2014
1 parent fc75bf4 commit ed36bfa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2014-06-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>

* sysdeps/powerpc/powerpc64/power7/strncat.S [STRLEN]: Define it as
strlen for non SHARED builds.

2014-06-05 Siddhesh Poyarekar <siddhesh@redhat.com>

* nptl/allocatestack.c (check_list): Inlined function...
Expand Down
6 changes: 5 additions & 1 deletion sysdeps/powerpc/powerpc64/power7/strncat.S
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@
#ifndef STRLEN
/* For builds with no IFUNC support, local calls should be made to internal
GLIBC symbol (created by libc_hidden_builtin_def). */
# define STRLEN __GI_strlen
# ifdef SHARED
# define STRLEN __GI_strlen
# else
# define STRLEN strlen
# endif
#endif

#define FRAMESIZE (FRAME_MIN_SIZE+32)
Expand Down

0 comments on commit ed36bfa

Please sign in to comment.