[src/trunk]: src Adjust for new __sigaction_siginfo symbol.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/abf0023c1efa
branches:  trunk
changeset: 1024750:abf0023c1efa
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Nov 02 06:54:10 2021 +0000

description:
Adjust for new __sigaction_siginfo symbol.

diffstat:

 lib/libc/compat/arch/powerpc64/sys/compat_missing.c                                       |  8 ++++----
 lib/libc/compat/include/signal.h                                                          |  4 ++--
 sys/external/bsd/compiler_rt/dist/lib/interception/interception_linux.cc                  |  3 ++-
 sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h |  3 ++-
 sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_signal_interceptors.inc  |  3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diffs (92 lines):

diff -r 91a7eb1c55ea -r abf0023c1efa lib/libc/compat/arch/powerpc64/sys/compat_missing.c
--- a/lib/libc/compat/arch/powerpc64/sys/compat_missing.c       Tue Nov 02 01:57:16 2021 +0000
+++ b/lib/libc/compat/arch/powerpc64/sys/compat_missing.c       Tue Nov 02 06:54:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_missing.c,v 1.1 2020/09/20 20:14:50 christos Exp $      */
+/*     $NetBSD: compat_missing.c,v 1.2 2021/11/02 06:54:10 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: compat_missing.c,v 1.1 2020/09/20 20:14:50 christos Exp $");
+__RCSID("$NetBSD: compat_missing.c,v 1.2 2021/11/02 06:54:10 thorpej Exp $");
 
 /*
  * define symbols that autoconf is supposed to find
@@ -50,14 +50,14 @@
 
 int sigaction(int, const struct sigaction * restrict,
     struct sigaction * restrict);
-int __sigaction14(int, const struct sigaction * restrict,
+int __sigaction_siginfo(int, const struct sigaction * restrict,
     struct sigaction * restrict);
 
 int
 sigaction(int sig, const struct sigaction * restrict act,
     struct sigaction * restrict oact)
 {
-       return __sigaction14(sig, act, oact);
+       return __sigaction_siginfo(sig, act, oact);
 }
 
 int sigpending(sigset_t *);
diff -r 91a7eb1c55ea -r abf0023c1efa lib/libc/compat/include/signal.h
--- a/lib/libc/compat/include/signal.h  Tue Nov 02 01:57:16 2021 +0000
+++ b/lib/libc/compat/include/signal.h  Tue Nov 02 06:54:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.2 2009/01/11 02:46:25 christos Exp $      */
+/*     $NetBSD: signal.h,v 1.3 2021/11/02 06:54:10 thorpej Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
 __BEGIN_DECLS
 int    sigaction(int, const struct sigaction13 * __restrict,
     struct sigaction13 * __restrict);
-int    __sigaction14(int, const struct sigaction * __restrict,
+int    __sigaction_siginfo(int, const struct sigaction * __restrict,
     struct sigaction * __restrict);
 int    sigaddset(sigset13_t *, int);
 int    __sigaddset14(sigset_t *, int);
diff -r 91a7eb1c55ea -r abf0023c1efa sys/external/bsd/compiler_rt/dist/lib/interception/interception_linux.cc
--- a/sys/external/bsd/compiler_rt/dist/lib/interception/interception_linux.cc  Tue Nov 02 01:57:16 2021 +0000
+++ b/sys/external/bsd/compiler_rt/dist/lib/interception/interception_linux.cc  Tue Nov 02 06:54:10 2021 +0000
@@ -28,7 +28,8 @@
     uptr real, uptr wrapper) {
 #if SANITIZER_NETBSD
   // XXX: Find a better way to handle renames
-  if (internal_strcmp(func_name, "sigaction") == 0) func_name = "__sigaction14";
+  // XXX: Do we have to handle the old __sigaction14 name here too?
+  if (internal_strcmp(func_name, "sigaction") == 0) func_name = "__sigaction_siginfo";
 #endif
   *func_addr = (uptr)dlsym(RTLD_NEXT, func_name);
   if (!*func_addr) {
diff -r 91a7eb1c55ea -r abf0023c1efa sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
--- a/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h Tue Nov 02 01:57:16 2021 +0000
+++ b/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_platform_limits_netbsd.h Tue Nov 02 06:54:10 2021 +0000
@@ -2384,7 +2384,8 @@
   COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==         \
                  offsetof(struct CLASS, MEMBER))
 
-#define SIGACTION_SYMNAME __sigaction14
+// XXX: Do we need to handle the old __sigaction14 name here too?
+#define SIGACTION_SYMNAME __sigaction_siginfo
 
 #endif  // SANITIZER_NETBSD
 
diff -r 91a7eb1c55ea -r abf0023c1efa sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_signal_interceptors.inc
--- a/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_signal_interceptors.inc  Tue Nov 02 01:57:16 2021 +0000
+++ b/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_signal_interceptors.inc  Tue Nov 02 06:54:10 2021 +0000
@@ -19,7 +19,8 @@
 using namespace __sanitizer;
 
 #if SANITIZER_NETBSD
-#define sigaction_symname __sigaction14
+// XXX: Do we need to handle the old __sigaction14 name here too?
+#define sigaction_symname __sigaction_siginfo
 #else
 #define sigaction_symname sigaction
 #endif