Module Name: src
Committed By: kamil
Date: Mon Sep 14 15:01:58 UTC 2020
Modified Files:
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/liblsan: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
Consistently, always link sanitizer runtime with libm and libpthread
This reflects the behavior from LLVM and avoids issues with dlsym(3) APIs.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/liblsan/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/libubsan/Makefile
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/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.32 src/external/gpl3/gcc/lib/libasan/Makefile:1.33
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.32 Mon Sep 7 09:09:40 2020
+++ src/external/gpl3/gcc/lib/libasan/Makefile Mon Sep 14 15:01:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2020/09/07 09:09:40 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2020/09/14 15:01:57 kamil Exp $
UNSUPPORTED_COMPILER.clang= # defined
NOSANITIZER= # defined
@@ -46,6 +46,7 @@ LIB= asan
SRCS+= ${ASAN_SRCS} lsan_common.cc lsan_common_linux.cc
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CPPFLAGS+=-DCAN_SANITIZE_UB=0
.if ${MACHINE_ARCH} == "vax"
Index: src/external/gpl3/gcc/lib/liblsan/Makefile
diff -u src/external/gpl3/gcc/lib/liblsan/Makefile:1.7 src/external/gpl3/gcc/lib/liblsan/Makefile:1.8
--- src/external/gpl3/gcc/lib/liblsan/Makefile:1.7 Fri May 15 14:29:53 2020
+++ src/external/gpl3/gcc/lib/liblsan/Makefile Mon Sep 14 15:01:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/15 14:29:53 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/14 15:01:57 kamil Exp $
.include <bsd.own.mk>
@@ -23,7 +23,9 @@ COPTS.sanitizer_file.cc += -O1
LIB= lsan
SRCS+= ${LSAN_SRCS}
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CWARNFLAGS.clang+= -Wno-error=unused-private-field
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.14 src/external/gpl3/gcc/lib/libtsan/Makefile:1.15
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.14 Mon Sep 14 14:33:01 2020
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Mon Sep 14 15:01:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/09/14 14:33:01 kamil Exp $
+# $NetBSD: Makefile,v 1.15 2020/09/14 15:01:58 kamil Exp $
UNSUPPORTED_COMPILER.clang= # defined
NOSANITIZER= # defined
@@ -64,6 +64,7 @@ LIB= tsan
SRCS+= ${TSAN_SRCS}
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CPPFLAGS+=-DCAN_SANITIZE_UB=0
COPTS.tsan_interceptors.cc += -Wno-unused-function
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.17 src/external/gpl3/gcc/lib/libubsan/Makefile:1.18
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.17 Sat Sep 5 09:50:15 2020
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Mon Sep 14 15:01:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/09/05 09:50:15 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2020/09/14 15:01:58 kamil Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -32,7 +32,9 @@ COPTS.sanitizer_file.cc += -O1
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
+LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CPPFLAGS+=-DCAN_SANITIZE_UB=1
.include <bsd.lib.mk>
