[git commit nptl_merge] regex: call memcpy() ourselves

Mike Frysinger vapier at gentoo.org
Mon Nov 9 21:17:04 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=1a39ca7231bd4c009c40255e7a20adbed3e31890
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl_merge

Call the hidden memcpy() ourselves otherwise gcc will emit a call to the
public memcpy() which goes through the PLT.

Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/misc/regex/regex_old.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index 3550698..cbfb7ae 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -8085,7 +8085,8 @@ regexec (
   int len = strlen (string);
   boolean want_reg_info = !preg->no_sub && nmatch > 0;
 
-  private_preg = *preg;
+  /* use hidden memcpy() ourselves rather than gcc calling public memcpy() */
+  memcpy(&private_preg, preg, sizeof(*preg));
 
   private_preg.not_bol = !!(eflags & REG_NOTBOL);
   private_preg.not_eol = !!(eflags & REG_NOTEOL);
-- 
1.6.3.3



More information about the uClibc-cvs mailing list