public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r14-359] libsanitizer: link hwasan against lsan library
Date: Sun, 30 Apr 2023 19:32:10 +0000 (GMT) [thread overview]
Message-ID: <20230430193210.0DB27385771D@sourceware.org> (raw)
https://gcc.gnu.org/g:54765c875a0ec961e06d56d916d9ad1ddfc3b221
commit r14-359-g54765c875a0ec961e06d56d916d9ad1ddfc3b221
Author: Martin Liska <mliska@suse.cz>
Date: Sun Apr 30 21:28:15 2023 +0200
libsanitizer: link hwasan against lsan library
Similarly to libasan.so, libhwasan.so also utilizes some
of the symbols from lsan library.
PR sanitizer/109674
libsanitizer/ChangeLog:
* hwasan/Makefile.am: Depend on liblsan.
* hwasan/Makefile.in: Re-generate.
Diff:
---
libsanitizer/hwasan/Makefile.am | 2 +-
libsanitizer/hwasan/Makefile.in | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libsanitizer/hwasan/Makefile.am b/libsanitizer/hwasan/Makefile.am
index 5a89189f6d8..bb7f8fa0b7b 100644
--- a/libsanitizer/hwasan/Makefile.am
+++ b/libsanitizer/hwasan/Makefile.am
@@ -38,7 +38,7 @@ hwasan_files = \
hwasan_type_test.cpp
libhwasan_la_SOURCES = $(hwasan_files)
-libhwasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la
+libhwasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/lsan/libsanitizer_lsan.la
if !USING_MAC_INTERPOSE
libhwasan_la_LIBADD += $(top_builddir)/interception/libinterception.la
endif
diff --git a/libsanitizer/hwasan/Makefile.in b/libsanitizer/hwasan/Makefile.in
index 4240aa90147..58bc26b44b9 100644
--- a/libsanitizer/hwasan/Makefile.in
+++ b/libsanitizer/hwasan/Makefile.in
@@ -148,7 +148,8 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libhwasan_la_DEPENDENCIES = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \
- $(am__append_1) $(am__append_2) $(am__DEPENDENCIES_1)
+ $(top_builddir)/lsan/libsanitizer_lsan.la $(am__append_1) \
+ $(am__append_2) $(am__DEPENDENCIES_1)
am__objects_1 = hwasan_allocation_functions.lo hwasan_allocator.lo \
hwasan.lo hwasan_dynamic_shadow.lo hwasan_exceptions.lo \
hwasan_fuchsia.lo hwasan_globals.lo hwasan_interceptors.lo \
@@ -444,7 +445,8 @@ hwasan_files = \
libhwasan_la_SOURCES = $(hwasan_files)
libhwasan_la_LIBADD = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \
- $(am__append_1) $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS)
+ $(top_builddir)/lsan/libsanitizer_lsan.la $(am__append_1) \
+ $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libhwasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libhwasan)
# Work around what appears to be a GNU make bug handling MAKEFLAGS
reply other threads:[~2023-04-30 19:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230430193210.0DB27385771D@sourceware.org \
--to=marxin@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).