diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:15:57 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:19:32 +0200 |
commit | ce0b7961ae400e5aeff28d54dc14955199947b74 (patch) | |
tree | 3e7acb0eb6915c2c3af747dd9d982d4dc3418b78 /sysdeps/nptl/Makefile | |
parent | 0197c1bc604e1d6357cfa07a75ab73bababa7f0f (diff) | |
download | glibc-ce0b7961ae400e5aeff28d54dc14955199947b74.tar.gz |
nptl: Consolidate async cancel enable/disable implementation in libc
Previously, the source file nptl/cancellation.c was compiled multiple
times, for libc, libpthread, librt. This commit switches to a single
implementation, with new __pthread_enable_asynccancel@@GLIBC_PRIVATE,
__pthread_disable_asynccancel@@GLIBC_PRIVATE exports.
The almost-unused CANCEL_ASYNC and CANCEL_RESET macros are replaced
by LIBC_CANCEL_ASYNC and LIBC_CANCEL_ASYNC macros. They call the
__pthread_* functions unconditionally now. The macros are still
needed because shared code uses them; Hurd has different definitions.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/nptl/Makefile')
-rw-r--r-- | sysdeps/nptl/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile index adcced422b..632cd3686b 100644 --- a/sysdeps/nptl/Makefile +++ b/sysdeps/nptl/Makefile @@ -21,8 +21,7 @@ libpthread-sysdep_routines += errno-loc endif ifeq ($(subdir),rt) -librt-sysdep_routines += timer_routines librt-cancellation -CFLAGS-librt-cancellation.c += -fexceptions -fasynchronous-unwind-tables +librt-sysdep_routines += timer_routines tests += tst-mqueue8x CFLAGS-tst-mqueue8x.c += -fexceptions |