aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-14 05:22:43 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-14 05:22:43 +0000
commite2982bf018ff39fcfb452012027479a07457fa92 (patch)
tree62820a6b63ee85953b763f3393eb8b5a6bfe5f01 /nptl
parent40b334afb47c606d39a5be4119378596dde2cffc (diff)
downloadglibc-e2982bf018ff39fcfb452012027479a07457fa92.zip
glibc-e2982bf018ff39fcfb452012027479a07457fa92.tar.gz
glibc-e2982bf018ff39fcfb452012027479a07457fa92.tar.bz2
Update.
2004-01-29 Steven Munroe <sjmunroe@us.ibm.com> * Makefile (libpthread-routines): Add pt-cleanup. * pt-longjmp.c: Removed. * pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file. * sysdeps/generic/pt-longjmp.c: Copied longjmp to here. New file. * sysdeps/unix/sysv/linux/powerpc/Versions: New file. Version longjmp, siglongjmp for GLIBC_2.3.4. * sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: New File.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog10
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl/pt-cleanup.c (renamed from nptl/pt-longjmp.c)7
-rw-r--r--nptl/sysdeps/generic/pt-longjmp.c29
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/Versions5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c68
6 files changed, 113 insertions, 8 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c37d8a3ad..f69a346 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-29 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * Makefile (libpthread-routines): Add pt-cleanup.
+ * pt-longjmp.c: Removed.
+ * pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file.
+ * sysdeps/generic/pt-longjmp.c: Copied longjmp to here. New file.
+ * sysdeps/unix/sysv/linux/powerpc/Versions: New file.
+ Version longjmp, siglongjmp for GLIBC_2.3.4.
+ * sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: New File.
+
2004-02-13 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/pthread_cond_timedwait.c
diff --git a/nptl/Makefile b/nptl/Makefile
index c67bfe4..715dd76 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -99,7 +99,7 @@ libpthread-routines = init events version \
sem_wait sem_trywait sem_timedwait sem_post \
cleanup cleanup_defer cleanup_compat \
cleanup_defer_compat unwind \
- pt-longjmp \
+ pt-longjmp pt-cleanup\
cancellation \
lowlevellock \
pt-vfork \
diff --git a/nptl/pt-longjmp.c b/nptl/pt-cleanup.c
index 2022386..96836a1 100644
--- a/nptl/pt-longjmp.c
+++ b/nptl/pt-cleanup.c
@@ -62,10 +62,3 @@ __pthread_cleanup_upto (__jmp_buf target, char *targetframe)
}
hidden_def (__pthread_cleanup_upto)
-
-void
-longjmp (jmp_buf env, int val)
-{
- __libc_longjmp (env, val);
-}
-weak_alias (longjmp, siglongjmp)
diff --git a/nptl/sysdeps/generic/pt-longjmp.c b/nptl/sysdeps/generic/pt-longjmp.c
new file mode 100644
index 0000000..f161380
--- /dev/null
+++ b/nptl/sysdeps/generic/pt-longjmp.c
@@ -0,0 +1,29 @@
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include "pthreadP.h"
+
+void
+longjmp (jmp_buf env, int val)
+{
+ __libc_longjmp (env, val);
+}
+weak_alias (longjmp, siglongjmp)
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
new file mode 100644
index 0000000..f63cf41
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
@@ -0,0 +1,5 @@
+libpthread {
+ GLIBC_2.3.4 {
+ longjmp; siglongjmp;
+ }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c b/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c
new file mode 100644
index 0000000..eac5290
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c
@@ -0,0 +1,68 @@
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include <bits/wordsize.h>
+#include "pthreadP.h"
+#include <shlib-compat.h>
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
+
+/* These functions are not declared anywhere since they shouldn't be
+ used at another place but here. */
+extern void __novmx__libc_siglongjmp (sigjmp_buf env, int val)
+ __attribute__ ((noreturn));
+extern void __novmx__libc_longjmp (sigjmp_buf env, int val)
+ __attribute__ ((noreturn));
+
+
+void __novmxsiglongjmp (sigjmp_buf env, int val)
+{
+ __novmx__libc_siglongjmp (env, val);
+}
+
+void __novmxlongjmp (jmp_buf env, int val)
+{
+ __novmx__libc_longjmp (env, val);
+}
+
+# if __WORDSIZE == 64
+symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3);
+symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3);
+# else
+symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0);
+symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0);
+# endif
+#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */
+
+void
+__vmx_longjmp (jmp_buf env, int val)
+{
+ __libc_longjmp (env, val);
+}
+
+void
+__vmx_siglongjmp (jmp_buf env, int val)
+{
+ __libc_siglongjmp (env, val);
+}
+
+versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4);
+versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4);
+