diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sysdeps/s390/s390-64/bcopy.S | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index fffc11f424..9e4d6f68b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/s390/s390-64/bcopy.S (__bcopy): Use + HIDDEN_BUILTIN_JUMPTARGET to jump to memmove. + 2005-06-27 Carlos O'Donell <carlos@systemhalted.org> * posix/regcomp.c (re_compile_internal): Call __libc_lock_init diff --git a/sysdeps/s390/s390-64/bcopy.S b/sysdeps/s390/s390-64/bcopy.S index ff7966723b..abcb1fb1b4 100644 --- a/sysdeps/s390/s390-64/bcopy.S +++ b/sysdeps/s390/s390-64/bcopy.S @@ -1,6 +1,6 @@ /* bcopy -- copy a block from source to destination. 64 bit S/390 version. This file is part of the GNU C Library. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). The GNU C Library is free software; you can redistribute it and/or @@ -59,14 +59,10 @@ ENTRY(__bcopy) jo .L6 br %r14 .L7: # destructive overlay, can not use mvcle - lgr %r1,%r2 # bcopy is called with source,dest - lgr %r2,%r3 # memmove with dest,source! Oh, well... - lgr %r3,%r1 -#ifdef PIC - jg memmove@PLT -#else - jg memmove -#endif + lgr %r1,%r2 # bcopy is called with source,dest + lgr %r2,%r3 # memmove with dest,source! Oh, well... + lgr %r3,%r1 + jg HIDDEN_BUILTIN_JUMPTARGET(memmove) END(__bcopy) |