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 --git a/libsanitizer/hwasan/Makefile.am b/libsanitizer/hwasan/Makefile.am
index 5a89189f6d8f95da8b40d5485e38a8ae4e71c312..bb7f8fa0b7b8f1aeb3bcbfd01303f525a41f7020 100644 (file)
--- 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 4240aa9014717450f21612ca438e5a1e20b552c3..58bc26b44b9efb688936b3641901e1c1aa4b21ef 100644 (file)
--- 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