[binutils-gdb] libctf: link against libiberty before linking in libbfd or libctf-nobfd

[Nick Alcock]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7d53105d6ed984aec255fa0eacd0405f3c1bb874

commit 7d53105d6ed984aec255fa0eacd0405f3c1bb874
Author: Nick Alcock <nick.alcock@oracle.com>
Date:   Mon Sep 27 20:31:21 2021 +0100

    libctf: link against libiberty before linking in libbfd or libctf-nobfd
    
    This ensures that the CTF_LIBADD, which always contains at least this
    when doing a shared link:
    
    -L`pwd`/../libiberty/pic -liberty
    
    appears in the link line before any requirements pulled in by libbfd.la,
    which include -liberty but because it is install-time do not include the
    -L`pwd`/../libiberty/pic portion (in an indirect dep like this, the path
    comes from the libbfd.la file, and is an install path).  libiberty also
    appears after libbfd in the link line by virtue of libctf-nobfd.la,
    because libctf-nobfd has to follow libbfd in the link line, and that
    needs symbols from libiberty too.
    
    Without this, an installed liberty might well be pulled in by libbfd,
    and if --enable-install-libiberty is not specified this libiberty might
    be completely incompatible with what is being installed and break either
    or boht of libbfd and libctf. (The specific problem observed here is
    that bsearch_r was not present, but other problems might easily be
    observed in future too.)
    
    Because ld links against libctf, this has a tendency to break the system
    linker at install time too, if installing with --prefix=/usr.  That's
    quite unpleasant to recover from.
    
    libctf/ChangeLog
    2021-09-27  Nick Alcock  <nick.alcock@oracle.com>
    
            PR libctf/27360
            * Makefile.am (libctf_la_LIBADD): Link against libiberty
            before pulling in libbfd.la or pulling in libctf-nobfd.la.
            * Makefile.in: Regenerate.

Diff:
---
 libctf/ChangeLog   | 7 +++++++
 libctf/Makefile.am | 6 +++++-
 libctf/Makefile.in | 7 ++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 7ccc54209b0..da361e4450d 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,10 @@
+2021-09-27  Nick Alcock  <nick.alcock@oracle.com>
+
+	PR libctf/27360
+	* Makefile.am (libctf_la_LIBADD): Link against libiberty
+	before pulling in libbfd.la or pulling in libctf-nobfd.la.
+	* Makefile.in: Regenerate.
+
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* 2.37 release branch created.
diff --git a/libctf/Makefile.am b/libctf/Makefile.am
index 76881844798..970b66dc608 100644
--- a/libctf/Makefile.am
+++ b/libctf/Makefile.am
@@ -52,7 +52,11 @@ if NEED_CTF_QSORT_R
 libctf_nobfd_la_SOURCES += ctf-qsort_r.c
 endif
 
-libctf_la_LIBADD = ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
+# @CTF_LIBADD@ appears here twice: once, to force libiberty to get searched before
+# install-time libbfd adds a -L to the install dir (possibly pointing at an
+# incompatible libiberty), and once via lictf_nobfd_la_LIBADD so that the
+# references in there get picked up.
+libctf_la_LIBADD =  @CTF_LIBADD@ ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
 libctf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0
 libctf_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
 libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c
diff --git a/libctf/Makefile.in b/libctf/Makefile.in
index bb3b88fc109..e8a1443ba28 100644
--- a/libctf/Makefile.in
+++ b/libctf/Makefile.in
@@ -476,7 +476,12 @@ libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c \
 	ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c ctf-dedup.c \
 	ctf-link.c ctf-lookup.c ctf-open.c ctf-serialize.c ctf-sha1.c \
 	ctf-string.c ctf-subr.c ctf-types.c ctf-util.c $(am__append_1)
-libctf_la_LIBADD = ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
+
+# @CTF_LIBADD@ appears here twice: once, to force libiberty to get searched before
+# install-time libbfd adds a -L to the install dir (possibly pointing at an
+# incompatible libiberty), and once via lictf_nobfd_la_LIBADD so that the
+# references in there get picked up.
+libctf_la_LIBADD = @CTF_LIBADD@ ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
 libctf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0
 libctf_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
 libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c