* sysdeps/powerpc/powerpc32/setjmp-common.S [IS_IN_rtld]: Avoid

	call to __sigjmp_save.
	* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1b7587ec880c38ca2554d048b442e0ef419009a8..3ad8ff94951aeb1189a03e65f14601c319c867c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/sysdeps/powerpc/powerpc32/setjmp-common.S b/sysdeps/powerpc/powerpc32/setjmp-common.S
index ad7113f461e88dc4cc585699c82bdbdfdde25a56..ae21284e0343cbf89cd1b2264ed8b0b3364bd131 100644 (file)
--- a/sysdeps/powerpc/powerpc32/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/setjmp-common.S
@@ -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
@@ -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))

diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S
index 0de07a82d3f20d64cdc9c8d22fc65f93881abcac..c1926ecd688b80e0cf6df24343588154cedb1eef 100644 (file)
--- a/sysdeps/powerpc/powerpc64/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/setjmp-common.S
@@ -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
@@ -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))