{"id":808391,"url":"http://patchwork.ozlabs.org/api/patches/808391/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/1504206900-13136-1-git-send-email-adhemerval.zanella@linaro.org/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504206900-13136-1-git-send-email-adhemerval.zanella@linaro.org>","list_archive_url":null,"date":"2017-08-31T19:15:00","name":"[COMMITTED] Remove NO_CANCELLATION macro","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b296b3a7d0bc4cf9c19f47ed1a29ffb8ebe048ea","submitter":{"id":66065,"url":"http://patchwork.ozlabs.org/api/people/66065/?format=json","name":"Adhemerval Zanella Netto","email":"adhemerval.zanella@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/1504206900-13136-1-git-send-email-adhemerval.zanella@linaro.org/mbox/","series":[{"id":894,"url":"http://patchwork.ozlabs.org/api/series/894/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=894","date":"2017-08-31T19:15:00","name":"[COMMITTED] Remove NO_CANCELLATION macro","version":1,"mbox":"http://patchwork.ozlabs.org/series/894/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808391/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808391/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-83996-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"nL4KWom1\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjsYB1GvTz9s8V\n\tfor ;\n\tFri, 1 Sep 2017 05:16:13 +1000 (AEST)","(qmail 15975 invoked by alias); 31 Aug 2017 19:15:27 -0000","(qmail 8439 invoked by uid 89); 31 Aug 2017 19:15:23 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:subject:date:message-id; q=dns; s=\n\tdefault; b=hdvBePBdvz37+pZ+GMYtKNLYuRikL3rHxpKSBBilcMK+DOjk5hr1w\n\tiOGkVsGT56TFwFBXz/OcF6t2DSmDC98ZEb0SzZwCDQJNLDKEg7Wg9cFPsOm6vXVU\n\t0XpRlG6np0WahXgY9V8yYtGgSntvNm+hzbjhweXzMK2y0BBt6DOM3w=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:subject:date:message-id; s=default;\n\tbh=zR80o3OhNGJHmNgBH68klCS60Ow=; b=nL4KWom1yHjOT+y3v/47Wxtp9szR\n\tiU4Rs4U4D00VNPtBTe9RK0gLqlARVKqj6KnLRnrrxP13laZE7JPSiq0SoGnpotiF\n\tzptf+jN7UA2wBdh6Dt99GMJXafPoGAotvKK8BojEO5CVSRUaE4IJQmNUDXZg2xPo\n\tPIrehjZt5eXfmag=","Mailing-List":"contact libc-alpha-help@sourceware.org; run by ezmlm","Precedence":"bulk","List-Id":"","List-Unsubscribe":"","List-Subscribe":"","List-Archive":"","List-Post":"","List-Help":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n\tGIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_SORBS_SPAM,\n\tSPF_PASS autolearn=ham version=3.3.2 spammy=","X-HELO":"mail-qk0-f178.google.com","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id;\n\tbh=IonfQiCQkhpUJBtF/FzkeBL4NFwhfBoTO24/i261+A4=;\n\tb=eImSV9rFrl7lfOMe0vpiYMhns4e24kzMQQc++rAoq+4CNty/h5y0zNwr6hKpBgFZKG\n\t3/BqmRBB3AQ1b3wgdIjeF+ApSAFwt0crMTHqZIpzxwvpgXkkfS1zwYjCx0aGVJ1jEDRC\n\tr8uN637sQ4wApiy2iUdUUt9w3Ba/5+BXMYHgJmD7KpfXUvrESwEqqCBtyhn7TB62ySkn\n\t7KLcSxbfNnbc1MH1r5F6hPcExxj8Ez8bKhFT3jL6GtEnO38ONJb824bFl0J9bNJpJ9uD\n\tPm6z62i1JPfbWsmBCZBz8dhkicIy4OO2PpU9XopzQXQeoAjv1QFZwmLyUzPqJtehkd3w\n\tl12w==","X-Gm-Message-State":"AHPjjUhDrj5OaK4W035z0NV+GbbzOAnBmLjLvoiCsoL7KBHhu8mWF+Gu\n\tlLlCfWdbJHqhGqtBwEXJfQ==","X-Google-Smtp-Source":"ADKCNb5GDnvIvlbT+Cdoq2NWcwiJkubRFuI2AUN5pM6IknY36avySbzCc9+65n03PKuILkRkhrdM/A==","X-Received":"by 10.55.164.134 with SMTP id n128mr5683889qke.145.1504206907682;\n\tThu, 31 Aug 2017 12:15:07 -0700 (PDT)","From":"Adhemerval Zanella ","To":"libc-alpha@sourceware.org","Subject":"[COMMITTED] Remove NO_CANCELLATION macro","Date":"Thu, 31 Aug 2017 16:15:00 -0300","Message-Id":"<1504206900-13136-1-git-send-email-adhemerval.zanella@linaro.org>"},"content":"The NO_CANCELLATION macro is used currently on generic headers to\ndefine non cancellable syscalls and on Linux fcntl to implement the non\ncancellable variation. Former should be single-handled by not-cancel.h\nheader and former could be simplified build both cancellable and non\ncancellable for default objects and alias the non-cancellable to default\none for rtld ones (since Linux already support cancellation as default).\n\nThis patch thus removes the NO_CANCELLATION macro and its usage. The\ngeneric non cancellable fcntl is route to internal fcntl.\n\nChecked on x86_64-linux-gnu and i686-linux-gnu. Also checked with\na build again major ABIs.\n\n\t* sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro.\n\t* sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/arm/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h\n\t(NO_CANCELLATION): Likewise.\n\t* sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h\n\t(NO_CANCELLATION): Likewise.\n\t* sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h\n\t(NO_CANCELLATION): Likewise.\n\t* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise\n\t* sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/tile/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (NO_CANCELLATION):\n\tLikewise.\n\t* sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Add\n\thidden prototype.\n\t* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Define only\n\tfor !IS_IN (rtld) and remove NO_CANCELLATION usage.\n---\n ChangeLog | 42 ++++++++++++++++++++++\n sysdeps/generic/not-cancel.h | 2 --\n sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/arm/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/fcntl.c | 24 +++++++------\n sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/mips/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/not-cancel.h | 3 +-\n sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h | 1 -\n .../unix/sysv/linux/s390/s390-32/sysdep-cancel.h | 1 -\n .../unix/sysv/linux/s390/s390-64/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/tile/sysdep-cancel.h | 1 -\n sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h | 1 -\n 21 files changed, 58 insertions(+), 30 deletions(-)","diff":"diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h\nindex e5a850c..41ce1fc 100644\n--- a/sysdeps/generic/not-cancel.h\n+++ b/sysdeps/generic/not-cancel.h\n@@ -44,5 +44,3 @@\n __nanosleep (requested_time, remaining)\n #define __fcntl_nocancel(fd, cmd, ...) \\\n __fcntl (fd, cmd, __VA_ARGS__)\n-\n-#define NO_CANCELLATION 1\ndiff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h\nindex 80732f5..27741a3 100644\n--- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h\n@@ -41,7 +41,6 @@ extern int __local_multiple_threads attribute_hidden;\n \n /* For rtld, et cetera. */\n # define SINGLE_THREAD_P 1\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h\nindex 72e6c0c..561cb67 100644\n--- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h\n@@ -39,7 +39,6 @@ extern int __local_multiple_threads attribute_hidden;\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h\nindex 8930245..b227187 100644\n--- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h\n@@ -40,7 +40,6 @@ extern int __local_multiple_threads attribute_hidden;\n \n /* For rtld, et cetera. */\n # define SINGLE_THREAD_P 1\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/fcntl.c b/sysdeps/unix/sysv/linux/fcntl.c\nindex 76e846c..cda6be7 100644\n--- a/sysdeps/unix/sysv/linux/fcntl.c\n+++ b/sysdeps/unix/sysv/linux/fcntl.c\n@@ -19,6 +19,7 @@\n #include \n #include \n #include \n+#include \n \n #ifndef __NR_fcntl64\n # define __NR_fcntl64 __NR_fcntl\n@@ -46,9 +47,8 @@ fcntl_common (int fd, int cmd, void *arg)\n return INLINE_SYSCALL_CALL (fcntl64, fd, cmd, (void *) arg);\n }\n \n-#ifndef NO_CANCELLATION\n int\n-__fcntl_nocancel (int fd, int cmd, ...)\n+__libc_fcntl (int fd, int cmd, ...)\n {\n va_list ap;\n void *arg;\n@@ -57,12 +57,18 @@ __fcntl_nocancel (int fd, int cmd, ...)\n arg = va_arg (ap, void *);\n va_end (ap);\n \n+ cmd = FCNTL_ADJUST_CMD (cmd);\n+\n+ if (cmd == F_SETLKW || cmd == F_SETLKW64)\n+ return SYSCALL_CANCEL (fcntl64, fd, cmd, (void *) arg);\n+\n return fcntl_common (fd, cmd, arg);\n }\n-#endif\n+libc_hidden_def (__libc_fcntl)\n \n+#if !IS_IN (rtld)\n int\n-__libc_fcntl (int fd, int cmd, ...)\n+__fcntl_nocancel (int fd, int cmd, ...)\n {\n va_list ap;\n void *arg;\n@@ -71,14 +77,12 @@ __libc_fcntl (int fd, int cmd, ...)\n arg = va_arg (ap, void *);\n va_end (ap);\n \n- cmd = FCNTL_ADJUST_CMD (cmd);\n-\n- if (cmd == F_SETLKW || cmd == F_SETLKW64)\n- return SYSCALL_CANCEL (fcntl64, fd, cmd, (void *) arg);\n-\n return fcntl_common (fd, cmd, arg);\n }\n-libc_hidden_def (__libc_fcntl)\n+#else\n+strong_alias (__libc_fcntl, __fcntl_nocancel)\n+#endif\n+libc_hidden_def (__fcntl_nocancel)\n \n weak_alias (__libc_fcntl, __fcntl)\n libc_hidden_weak (__fcntl)\ndiff --git a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h\nindex bf88ea5..8a85fc2 100644\n--- a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h\n@@ -38,7 +38,6 @@\n \n /* This code should never be used but we define it anyhow. */\n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n /* IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) */\ndiff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h\nindex 7ad851a..5c11983 100644\n--- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h\nindex d3d02d4..fe5b35a 100644\n--- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h\n@@ -25,7 +25,6 @@\n __glibc_likely (THREAD_GETMEM (THREAD_SELF, header.multiple_threads) == 0)\n #else\n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n #endif\n \n #define RTLD_SINGLE_THREAD_P \\\ndiff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h\nindex cf96c10..b192a68 100644\n--- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h\n@@ -27,7 +27,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION (1)\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h\nindex 8655c9d..120ea06 100644\n--- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h\n@@ -38,7 +38,6 @@ extern int __local_multiple_threads attribute_hidden;\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION (1)\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h\nindex 76d7ef4..31dbba0 100644\n--- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P 1\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h b/sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h\nindex 73b6236..4e7f536 100644\n--- a/sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P 1\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h\nindex ae0b059..8f4f338 100644\n--- a/sysdeps/unix/sysv/linux/not-cancel.h\n+++ b/sysdeps/unix/sysv/linux/not-cancel.h\n@@ -86,6 +86,7 @@ __typeof (__nanosleep) __nanosleep_nocancel;\n hidden_proto (__nanosleep_nocancel)\n \n /* Uncancelable fcntl. */\n-__typeof (__fcntl) __fcntl_nocancel attribute_hidden;\n+__typeof (__fcntl) __fcntl_nocancel;\n+libc_hidden_proto (__fcntl_nocancel)\n \n #endif /* NOT_CANCEL_H */\ndiff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h\nindex 532df31..59f752f 100644\n--- a/sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h\nindex 459b742..bd606d5 100644\n--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h\nindex 99adad1..2283b86 100644\n--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h\n@@ -43,7 +43,6 @@ extern int __local_multiple_threads attribute_hidden;\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h\nindex 3f880bd..b2deb11 100644\n--- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h\n@@ -27,7 +27,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h\nindex 412b31a..7fe0dee 100644\n--- a/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h\nindex 277709f..a606b0c 100644\n--- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h\n@@ -28,7 +28,6 @@\n #else\n \n # define SINGLE_THREAD_P 1\n-# define NO_CANCELLATION 1\n \n #endif\n \ndiff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h\nindex c1c0719..34f14c6 100644\n--- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h\n+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h\n@@ -43,7 +43,6 @@ extern int __local_multiple_threads attribute_hidden;\n #else\n \n # define SINGLE_THREAD_P (1)\n-# define NO_CANCELLATION 1\n \n #endif\n \n","prefixes":["COMMITTED"]}