aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-20 23:36:05 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-20 23:36:05 +0000
commit5990e1fe120708a10ae8ab0caf4a284b5d6b10f8 (patch)
tree7c79ab4c3f52fc6af4496e2c00c0ffa73b8bf608 /linuxthreads
parentf1c616fc8e249876e08bc01bb9748492515f65e2 (diff)
downloadglibc-5990e1fe120708a10ae8ab0caf4a284b5d6b10f8.tar
glibc-5990e1fe120708a10ae8ab0caf4a284b5d6b10f8.tar.gz
glibc-5990e1fe120708a10ae8ab0caf4a284b5d6b10f8.tar.bz2
glibc-5990e1fe120708a10ae8ab0caf4a284b5d6b10f8.zip
Update.
* sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c [SHARED]: Code only valid for SHARED case. Correct spelling of __vmx_longjmp.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog3
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c16
2 files changed, 11 insertions, 8 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 52f6d6c995..e7d0902cc8 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
2004-02-20 Steven Munroe <sjmunroe@us.ibm.com>
+ * sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c [SHARED]: Code only
+ valid for SHARED case. Correct spelling of __vmx_longjmp.
+
* sysdeps/powerpc/pspinlock.c: Move from here.
* sysdeps/powerpc/powerpc32/pspinlock.c: To here.
* sysdeps/powerpc/powerpc64/pspinlock.c: New file.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
index d22be13145..177256c7fb 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c
@@ -19,7 +19,8 @@
#include <setjmp.h>
#include <bits/wordsize.h>
#include <shlib-compat.h>
-#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4)
+#if defined SHARED
+# if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4)
/* These functions are not declared anywhere since they shouldn't be
used at another place but here. */
@@ -39,14 +40,14 @@ void __novmx_longjmp (jmp_buf env, int val)
__novmx__libc_longjmp (env, val);
}
-# if __WORDSIZE == 64
+# if __WORDSIZE == 64
symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3);
symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3);
-# else
+# else
symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0);
symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0);
-# endif
-#endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) ) */
+# endif
+# endif /* SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) ) */
/* These functions are not declared anywhere since they shouldn't be
used at another place but here. */
@@ -55,16 +56,15 @@ extern void __vmx__libc_siglongjmp (sigjmp_buf env, int val)
extern void __vmx__libc_longjmp (sigjmp_buf env, int val)
__attribute__ ((noreturn));
-#ifdef SHARED
void __vmx_siglongjmp (sigjmp_buf env, int val)
{
__vmx__libc_siglongjmp (env, val);
}
-void __vmxlongjmp (jmp_buf env, int val)
+void __vmx_longjmp (jmp_buf env, int val)
{
__vmx__libc_longjmp (env, val);
}
-#endif
default_symbol_version (__vmx_longjmp,longjmp,GLIBC_2.3.4);
default_symbol_version (__vmx_siglongjmp,siglongjmp,GLIBC_2.3.4);
+#endif /* SHARED */