Module Name: src
Committed By: christos
Date: Sat Nov 13 15:34:39 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/interception:
interception_linux.cc
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc sanitizer_platform_limits_netbsd.h
sanitizer_signal_interceptors.inc
Log Message:
fix the remaining vestiges of __sigaction14; now the tsan signal tests work.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc
cvs rdiff -u -r1.42 -r1.43 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc:1.8 src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc:1.9
--- src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc:1.8 Sun Apr 11 19:54:26 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/interception/interception_linux.cc Sat Nov 13 10:34:39 2021
@@ -26,7 +26,7 @@ bool GetRealFunctionAddress(const char *
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) {
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.42 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.43
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.42 Thu Oct 28 10:31:20 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Sat Nov 13 10:34:39 2021
@@ -830,10 +830,10 @@ int internal_fork() {
#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));
}
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.6 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.7
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h:1.6 Sun Apr 11 19:54:27 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.h Sat Nov 13 10:34:39 2021
@@ -2410,7 +2410,7 @@ struct __sanitizer_cdbw {
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;
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc:1.2 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc:1.3
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc:1.2 Sun Apr 11 19:54:27 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_signal_interceptors.inc Sat Nov 13 10:34:39 2021
@@ -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
