[src/trunk]: src/external/gpl3/gcc/dist/libsanitizer fix the remaining vestig...

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

details:   https://anonhg.NetBSD.org/src/rev/e86e0b5a297f
branches:  trunk
changeset: 1025583:e86e0b5a297f
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Nov 13 15:34:39 2021 +0000

description:
fix the remaining vestiges of __sigaction14; now the tsan signal tests work.

diffstat:

 external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc                  |  2 +-
 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc                 |  4 ++--
 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h |  2 +-
 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc  |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r ddab511ef0f7 -r e86e0b5a297f external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc
--- a/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc    Sat Nov 13 15:17:22 2021 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc    Sat Nov 13 15:34:39 2021 +0000
@@ -26,7 +26,7 @@
     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";
+  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 ddab511ef0f7 -r e86e0b5a297f external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc   Sat Nov 13 15:17:22 2021 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc   Sat Nov 13 15:34:39 2021 +0000
@@ -830,10 +830,10 @@
 
 #if SANITIZER_NETBSD
 #include <signal.h>
-extern "C" int __sigaction14(int, const struct sigaction *, struct sigaction *);
+extern "C" int __sigaction__siginfo(int, const struct sigaction *, struct sigaction *);
 int internal_sigaction_norestorer(int signum, const void *act, void *oldact) {
 
-    return __sigaction14(signum,
+    return __sigaction__siginfo(signum,
        reinterpret_cast<const struct sigaction *>(act),
        reinterpret_cast<struct sigaction *>(oldact));
 }
diff -r ddab511ef0f7 -r e86e0b5a297f external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h   Sat Nov 13 15:17:22 2021 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h   Sat Nov 13 15:34:39 2021 +0000
@@ -2410,7 +2410,7 @@
   COMPILER_CHECK(offsetof(struct __sanitizer_##CLASS, MEMBER) ==         \
                  offsetof(struct CLASS, MEMBER))
 
-#define SIGACTION_SYMNAME __sigaction14
+#define SIGACTION_SYMNAME __sigaction_siginfo
 
 // Compat with 9.0
 extern unsigned struct_statvfs90_sz;
diff -r ddab511ef0f7 -r e86e0b5a297f external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc    Sat Nov 13 15:17:22 2021 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc    Sat Nov 13 15:34:39 2021 +0000
@@ -17,7 +17,7 @@
 using namespace __sanitizer;
 
 #if SANITIZER_NETBSD
-#define sigaction_symname __sigaction14
+#define sigaction_symname __sigaction_siginfo
 #else
 #define sigaction_symname sigaction
 #endif