From: Carlos O'Donell Date: Thu, 26 Feb 2009 21:29:22 +0000 (+0000) Subject: 2009-02-25 Carlos O'Donell X-Git-Tag: upstream/2.30~10627^2~650 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ff04e6454adeb1887332341f3d6868db45d1dda;p=external%2Fglibc.git 2009-02-25 Carlos O'Donell * sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c: Update from nptl/sysdeps/pthread/unwind-forcedunwind.c * sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c: Update from nptl/sysdeps/pthread/unwind-resume.c --- diff --git a/ChangeLog.hppa b/ChangeLog.hppa index e99d768..538837c 100644 --- a/ChangeLog.hppa +++ b/ChangeLog.hppa @@ -1,5 +1,12 @@ 2009-02-25 Carlos O'Donell + * sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c: + Update from nptl/sysdeps/pthread/unwind-forcedunwind.c + * sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c: + Update from nptl/sysdeps/pthread/unwind-resume.c + +2009-02-25 Carlos O'Donell + * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Define FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET, FUTEX_CLOCK_REALTIME, and FUTEX_BITSET_MATCH_ANY. diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c index cea5d3b..e0eef90 100644 --- a/sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c +++ b/sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c @@ -1,5 +1,6 @@ -/* Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Jakub Jelinek . 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 @@ -20,8 +21,7 @@ #include #include #include - -#define LIBGCC_S_SO "libgcc_s.so.4" +#include static void *libgcc_s_handle; static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); @@ -32,15 +32,16 @@ static _Unwind_Reason_Code (*libgcc_s_forcedunwind) (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *); static _Unwind_Word (*libgcc_s_getcfa) (struct _Unwind_Context *); -#ifndef LIBGCC_S_SO -#define LIBGCC_S_SO "libgcc_s.so.1" -#endif +#define LIBGCC_S_SO "libgcc_s.so.4" void __attribute_noinline__ pthread_cancel_init (void) { - void *resume, *personality, *forcedunwind, *getcfa; + void *resume; + void *personality; + void *forcedunwind; + void *getcfa; void *handle; if (__builtin_expect (libgcc_s_handle != NULL, 1)) @@ -62,13 +63,17 @@ pthread_cancel_init (void) || ARCH_CANCEL_INIT (handle) #endif ) - __libc_fatal ("libgcc_s.so must be installed for pthread_cancel to work\n"); + __libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n"); + PTR_MANGLE (resume); libgcc_s_resume = resume; + PTR_MANGLE (personality); libgcc_s_personality = personality; + PTR_MANGLE (forcedunwind); libgcc_s_forcedunwind = forcedunwind; + PTR_MANGLE (getcfa); libgcc_s_getcfa = getcfa; - /* Make sure libgcc_s_getcfa is written last. Otherwise, + /* Make sure libgcc_s_handle is written last. Otherwise, pthread_cancel_init might return early even when the pointer the caller is interested in is not initialized yet. */ atomic_write_barrier (); @@ -90,10 +95,12 @@ __unwind_freeres (void) void _Unwind_Resume (struct _Unwind_Exception *exc) { - if (__builtin_expect (libgcc_s_resume == NULL, 0)) + if (__builtin_expect (libgcc_s_handle == NULL, 0)) pthread_cancel_init (); - libgcc_s_resume (exc); + void (*resume) (struct _Unwind_Exception *exc) = libgcc_s_resume; + PTR_DEMANGLE (resume); + resume (exc); } _Unwind_Reason_Code @@ -102,28 +109,37 @@ __gcc_personality_v0 (int version, _Unwind_Action actions, struct _Unwind_Exception *ue_header, struct _Unwind_Context *context) { - if (__builtin_expect (libgcc_s_personality == NULL, 0)) + if (__builtin_expect (libgcc_s_handle == NULL, 0)) pthread_cancel_init (); - return libgcc_s_personality (version, actions, exception_class, - ue_header, context); + _Unwind_Reason_Code (*personality) + (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, + struct _Unwind_Context *) = libgcc_s_personality; + PTR_DEMANGLE (personality); + return personality (version, actions, exception_class, ue_header, context); } _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *exc, _Unwind_Stop_Fn stop, void *stop_argument) { - if (__builtin_expect (libgcc_s_forcedunwind == NULL, 0)) + if (__builtin_expect (libgcc_s_handle == NULL, 0)) pthread_cancel_init (); - return libgcc_s_forcedunwind (exc, stop, stop_argument); + _Unwind_Reason_Code (*forcedunwind) + (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *) + = libgcc_s_forcedunwind; + PTR_DEMANGLE (forcedunwind); + return forcedunwind (exc, stop, stop_argument); } _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *context) { - if (__builtin_expect (libgcc_s_getcfa == NULL, 0)) + if (__builtin_expect (libgcc_s_handle == NULL, 0)) pthread_cancel_init (); - return libgcc_s_getcfa (context); + _Unwind_Word (*getcfa) (struct _Unwind_Context *) = libgcc_s_getcfa; + PTR_DEMANGLE (getcfa); + return getcfa (context); } diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c b/sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c index a7485e9..a31ba1a 100644 --- a/sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c +++ b/sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c @@ -1,5 +1,6 @@ -/* Copyright (C) 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. + Contributed by Jakub Jelinek . 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 @@ -27,11 +28,6 @@ static _Unwind_Reason_Code (*libgcc_s_personality) (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, struct _Unwind_Context *); -#ifndef LIBGCC_S_SO -#error LIBGCC_S_SO -#define LIBGCC_S_SO "libgcc_s.so.1" -#endif - static void init (void) { @@ -43,7 +39,7 @@ init (void) if (handle == NULL || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) - __libc_fatal ("libgcc_s.so must be installed for pthread_cancel to work\n"); + __libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n"); libgcc_s_resume = resume; libgcc_s_personality = personality;