Skip to content

Commit

Permalink
* sysdeps/powerpc/powerpc32/setjmp-common.S [IS_IN_rtld]: Avoid
Browse files Browse the repository at this point in the history
	call to __sigjmp_save.
	* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
  • Loading branch information
Ulrich Drepper committed Dec 18, 2005
1 parent a3c8855 commit d87921e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2005-12-18 Ulrich Drepper <drepper@redhat.com>

* sysdeps/powerpc/powerpc32/setjmp-common.S [IS_IN_rtld]: Avoid
call to __sigjmp_save.
* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.

* stdlib/cxa_atexit.c: Use PTR_MANGLE on function pointer. Fill in
flavor field last and protect with memory barrier.
* stdlib/on_exit.c: Likewise.
Expand Down
8 changes: 7 additions & 1 deletion sysdeps/powerpc/powerpc32/setjmp-common.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* setjmp for PowerPC.
Copyright (C) 1995-1997,1999-2001,2003,2004 Free Software Foundation, Inc.
Copyright (C) 1995-1997,1999-2001,2003,2004,2005
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
Expand Down Expand Up @@ -55,5 +56,10 @@ ENTRY (BP_SYM (__sigsetjmp))
stw r29,((JB_GPRS+15)*4)(3)
stw r30,((JB_GPRS+16)*4)(3)
stw r31,((JB_GPRS+17)*4)(3)
#if defined NOT_IN_libc && defined IS_IN_rtld
li r3,0
blr
#else
b BP_SYM (__sigjmp_save@local)
#endif
END (BP_SYM (__sigsetjmp))
7 changes: 6 additions & 1 deletion sysdeps/powerpc/powerpc64/setjmp-common.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* setjmp for PowerPC64.
Copyright (C) 1995-2003, 2004 Free Software Foundation, Inc.
Copyright (C) 1995-2003, 2004, 2005 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
Expand Down Expand Up @@ -177,5 +177,10 @@ L(aligned_save_vmx):
stvx 31,0,r6
L(no_vmx):
#endif
#if defined NOT_IN_libc && defined IS_IN_rtld
li r3,0
blr
#else
b JUMPTARGET (BP_SYM (__sigjmp_save))
#endif
END (BP_SYM (__sigsetjmp))

0 comments on commit d87921e

Please sign in to comment.