[Glibc-bsd-commits] r5966 - in trunk/glibc-ports-2.23/fbtl: . sysdeps/pthread
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Tue Mar 22 12:18:12 UTC 2016
Author: aurel32
Date: 2016-03-22 12:18:12 +0000 (Tue, 22 Mar 2016)
New Revision: 5966
Modified:
trunk/glibc-ports-2.23/fbtl/Makefile
trunk/glibc-ports-2.23/fbtl/descr.h
trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/Makefile
trunk/glibc-ports-2.23/fbtl/unwind.c
trunk/glibc-ports-2.23/fbtl/version.c
Log:
Merge from upstream:
commit 3e2ee6f0e3471ceb4c49f8287676a7050401bf8f
Author: Joseph Myers <joseph at codesourcery.com>
Date: Tue Oct 27 21:46:03 2015 +0000
Remove sysdeps/nptl/configure.ac.
sysdeps/nptl/configure.ac tests for forced unwind support and the C
cleanup attribute, giving errors if either is unsupported. It does
nothing beyond running those two tests.
Both the attribute, and _Unwind_GetCFA which is used in the forced
unwind test, were added in GCC 3.3. Thus these tests are long
obsolete, and this patch removes the configure fragment running them,
along with associated conditionals.
Modified: trunk/glibc-ports-2.23/fbtl/Makefile
===================================================================
--- trunk/glibc-ports-2.23/fbtl/Makefile 2016-03-22 11:31:46 UTC (rev 5965)
+++ trunk/glibc-ports-2.23/fbtl/Makefile 2016-03-22 12:18:12 UTC (rev 5966)
@@ -292,14 +292,12 @@
include ../Makeconfig
-ifeq ($(have-forced-unwind),yes)
tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \
tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \
tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \
tst-oncex3 tst-oncex4
-endif
ifeq ($(build-shared),yes)
tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \
tst-stackguard1
Modified: trunk/glibc-ports-2.23/fbtl/descr.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/descr.h 2016-03-22 11:31:46 UTC (rev 5965)
+++ trunk/glibc-ports-2.23/fbtl/descr.h 2016-03-22 12:18:12 UTC (rev 5966)
@@ -32,9 +32,7 @@
#include <dl-sysdep.h>
#include "../fbtl_db/thread_db.h"
#include <tls.h>
-#ifdef HAVE_FORCED_UNWIND
-# include <unwind.h>
-#endif
+#include <unwind.h>
#define __need_res_state
#include <resolv.h>
#include <kernel-features.h>
@@ -376,10 +374,8 @@
/* Next descriptor with a pending event. */
struct pthread *nextevent;
-#ifdef HAVE_FORCED_UNWIND
/* Machine-specific unwind info. */
struct _Unwind_Exception exc;
-#endif
/* If nonzero pointer to area allocated for the stack and its
size. */
Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/Makefile
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/Makefile 2016-03-22 11:31:46 UTC (rev 5965)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/Makefile 2016-03-22 12:18:12 UTC (rev 5966)
@@ -30,11 +30,9 @@
$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
endif
-ifeq ($(have-forced-unwind),yes)
tests += tst-mqueue8x
CFLAGS-tst-mqueue8x.c += -fexceptions
endif
-endif
ifeq ($(subdir),posix)
CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"FBTL $(version)"'
Modified: trunk/glibc-ports-2.23/fbtl/unwind.c
===================================================================
--- trunk/glibc-ports-2.23/fbtl/unwind.c 2016-03-22 11:31:46 UTC (rev 5965)
+++ trunk/glibc-ports-2.23/fbtl/unwind.c 2016-03-22 12:18:12 UTC (rev 5966)
@@ -24,8 +24,6 @@
#include "pthreadP.h"
#include <jmpbuf-unwind.h>
-#ifdef HAVE_FORCED_UNWIND
-
#ifdef _STACK_GROWS_DOWN
# define FRAME_LEFT(frame, other, adj) \
((uintptr_t) frame - adj >= (uintptr_t) other - adj)
@@ -117,9 +115,7 @@
abort ();
}
-#endif /* have forced unwind */
-
void
__cleanup_fct_attribute __attribute ((noreturn))
__pthread_unwind (__pthread_unwind_buf_t *buf)
@@ -127,42 +123,12 @@
struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
struct pthread *self = THREAD_SELF;
-#ifdef HAVE_FORCED_UNWIND
/* This is not a catchable exception, so don't provide any details about
the exception type. We do need to initialize the field though. */
THREAD_SETMEM (self, exc.exception_class, 0);
THREAD_SETMEM (self, exc.exception_cleanup, &unwind_cleanup);
_Unwind_ForcedUnwind (&self->exc, unwind_stop, ibuf);
-#else
- /* Handle the compatibility stuff first. Execute all handlers
- registered with the old method. We don't execute them in order,
- instead, they will run first. */
- struct _pthread_cleanup_buffer *oldp = ibuf->priv.data.cleanup;
- struct _pthread_cleanup_buffer *curp = THREAD_GETMEM (self, cleanup);
-
- if (curp != oldp)
- {
- do
- {
- /* Pointer to the next element. */
- struct _pthread_cleanup_buffer *nextp = curp->__prev;
-
- /* Call the handler. */
- curp->__routine (curp->__arg);
-
- /* To the next. */
- curp = nextp;
- }
- while (curp != oldp);
-
- /* Mark the current element as handled. */
- THREAD_SETMEM (self, cleanup, curp);
- }
-
- /* We simply jump to the registered setjmp buffer. */
- __libc_unwind_longjmp ((struct __jmp_buf_tag *) ibuf->cancel_jmp_buf, 1);
-#endif
/* NOTREACHED */
/* We better do not get here. */
Modified: trunk/glibc-ports-2.23/fbtl/version.c
===================================================================
--- trunk/glibc-ports-2.23/fbtl/version.c 2016-03-22 11:31:46 UTC (rev 5965)
+++ trunk/glibc-ports-2.23/fbtl/version.c 2016-03-22 12:18:12 UTC (rev 5966)
@@ -26,9 +26,7 @@
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
PARTICULAR PURPOSE.\n"
-#ifdef HAVE_FORCED_UNWIND
"Forced unwind support included.\n"
-#endif
;
More information about the Glibc-bsd-commits
mailing list