|
From: Paul F. <pa...@so...> - 2022-04-19 20:05:44
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=1dbc46750f7f716ae3b9cf718380df77422379da commit 1dbc46750f7f716ae3b9cf718380df77422379da Author: Paul Floyd <pj...@wa...> Date: Tue Apr 19 22:03:01 2022 +0200 Bug 452779 Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0) This fixes building. I may make the -lgcc and libgcc-sup conditonal on not using clang later. Diff: --- Makefile.tool.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.tool.am b/Makefile.tool.am index fe5f002cec..5ce32d9c35 100644 --- a/Makefile.tool.am +++ b/Makefile.tool.am @@ -16,14 +16,14 @@ TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \ $(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a endif - -TOOL_LDADD_COMMON = -lgcc \ - $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a +TOOL_LDADD_COMMON = -lgcc TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \ - $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) + $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) \ + $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a 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) \ + $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a endif |
|
From: Paul F. <pa...@so...> - 2022-04-27 19:12:04
|
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 |