From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 0DB27385771D; Sun, 30 Apr 2023 19:32:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DB27385771D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682883130; bh=S6sAED/yCB8wOx69VBL1hqiPCJeNMJWlhD2yhrdlBYg=; h=From:To:Subject:Date:From; b=GoBbYarQs7txPPu7HMMtqUGUfm1LHBK2oVZMyR5zAKBf+NanxZ3h5XVOamZk2IusT ZhHw87L9b9Gc3nu3xq6afeYUqZ3/RH1GybMX8FPx+8IjKCYYlmr+Z7tvYBZyEZfhvG BGLMwO5NjSPZBmt7RkUM32ahknuNeBhS9LUO0hwk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-359] libsanitizer: link hwasan against lsan library X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: e7ce7c4905fd254760b1cd187752a03bc0c148ba X-Git-Newrev: 54765c875a0ec961e06d56d916d9ad1ddfc3b221 Message-Id: <20230430193210.0DB27385771D@sourceware.org> Date: Sun, 30 Apr 2023 19:32:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:54765c875a0ec961e06d56d916d9ad1ddfc3b221 commit r14-359-g54765c875a0ec961e06d56d916d9ad1ddfc3b221 Author: Martin Liska 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