[PATCH] sysdeps: Remove duplicated INTERNAL_SYSCALL_NCS macros

Ryota Saito <[email protected]> Sun, 2 Aug 2026 04:52:59 +0900
Newsgroups gmane.comp.lib.glibc.alpha
Message-ID <[email protected]>
Commit 89b53077d2a ("nptl: Fix Race conditions in pthread cancellation
[BZ#12683]") added a second copy of the __INTERNAL_SYSCALL_NCS{0-7}
and INTERNAL_SYSCALL_NCS_CALL macros, which had already been defined
earlier in the same file by commit 00baddbb93 ("linux: Add generic
syscall implementation").  Remove the second copy.

Signed-off-by: Ryota Saito <[email protected]>
---
 sysdeps/unix/sysdep.h | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
index 365c582296..ccd1b0bd29 100644
--- a/sysdeps/unix/sysdep.h
+++ b/sysdeps/unix/sysdep.h
@@ -111,29 +111,6 @@
 #define INLINE_SYSCALL_CALL(...) \
   __INLINE_SYSCALL_DISP (__INLINE_SYSCALL, __VA_ARGS__)
 
-#define __INTERNAL_SYSCALL_NCS0(name) \
-  INTERNAL_SYSCALL_NCS (name, 0)
-#define __INTERNAL_SYSCALL_NCS1(name, a1) \
-  INTERNAL_SYSCALL_NCS (name, 1, a1)
-#define __INTERNAL_SYSCALL_NCS2(name, a1, a2) \
-  INTERNAL_SYSCALL_NCS (name, 2, a1, a2)
-#define __INTERNAL_SYSCALL_NCS3(name, a1, a2, a3) \
-  INTERNAL_SYSCALL_NCS (name, 3, a1, a2, a3)
-#define __INTERNAL_SYSCALL_NCS4(name, a1, a2, a3, a4) \
-  INTERNAL_SYSCALL_NCS (name, 4, a1, a2, a3, a4)
-#define __INTERNAL_SYSCALL_NCS5(name, a1, a2, a3, a4, a5) \
-  INTERNAL_SYSCALL_NCS (name, 5, a1, a2, a3, a4, a5)
-#define __INTERNAL_SYSCALL_NCS6(name, a1, a2, a3, a4, a5, a6) \
-  INTERNAL_SYSCALL_NCS (name, 6, a1, a2, a3, a4, a5, a6)
-#define __INTERNAL_SYSCALL_NCS7(name, a1, a2, a3, a4, a5, a6, a7) \
-  INTERNAL_SYSCALL_NCS (name, 7, a1, a2, a3, a4, a5, a6, a7)
-
-/* Issue a syscall defined by syscall number plus any other argument required.
-   It is similar to INTERNAL_SYSCALL_NCS macro, but without the need to pass
-   the expected argument number as third parameter.  */
-#define INTERNAL_SYSCALL_NCS_CALL(...) \
-  __INTERNAL_SYSCALL_DISP (__INTERNAL_SYSCALL_NCS, __VA_ARGS__)
-
 /* Cancellation macros.  */
 #include <syscall_types.h>
 
-- 
2.43.0