[Valgrind-developers] [valgrind] Bug 452779 Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0)

[Paul F. <pa...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=6af21da952bbf233352603de87a6009f4ef0f02b

commit 6af21da952bbf233352603de87a6009f4ef0f02b
Author: Paul Floyd <pj...@wa...>
Date:   Wed Apr 27 21:10:35 2022 +0200

    Bug 452779 Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0)
    
    Only link with libgcc-sup if the compiler is clang.
    Still need -lgcc

Diff:
---
 Makefile.tool.am | 13 ++++++++++---
 NEWS             |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.tool.am b/Makefile.tool.am
index 5ce32d9c35..df95029138 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -18,13 +18,20 @@ endif
 
 TOOL_LDADD_COMMON = -lgcc
 TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \
-	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) \
-	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON)
 if VGCONF_HAVE_PLATFORM_SEC
 TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
-	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) \
+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+endif
+
+if !COMPILER_IS_CLANG
+TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ += \
+	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+if VGCONF_HAVE_PLATFORM_SEC
+TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ += \
 	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
 endif
+endif
 
 
 # -Wl,--build-id=none is needed when linking tools with a linker that only
diff --git a/NEWS b/NEWS
index 480761bb22..a42ec24f25 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ than mailing the developers (or mailing lists) directly -- bugs that
 are not entered into bugzilla tend to get forgotten about or ignored.
 
 452274  memcheck crashes with Assertion 'sci->status.what == SsIdle' failed
+452779  Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0)
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX