From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ro@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1147)
 id 8438C3858C52; Thu, 21 Dec 2023 11:51:55 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8438C3858C52
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Rainer Orth <ro@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] ld: Add lib32 directories for 32-bit emulation on
 FreeBSD/amd64
X-Act-Checkin: binutils-gdb
X-Git-Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: bfcfa995f9461726d57f0d9a2879ba4352547870
X-Git-Newrev: 333a6b1a6399992cc98ac34727acf38136b770e6
Message-Id: <20231221115155.8438C3858C52@sourceware.org>
Date: Thu, 21 Dec 2023 11:51:55 +0000 (GMT)
X-BeenThere: binutils-cvs@sourceware.org
X-Mailman-Version: 2.1.30
Precedence: list
List-Id: Binutils-cvs mailing list <binutils-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/binutils-cvs/>
List-Help: <mailto:binutils-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/binutils-cvs>,
 <mailto:binutils-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Dec 2023 11:51:55 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D333a6b1a6399=
992cc98ac34727acf38136b770e6

commit 333a6b1a6399992cc98ac34727acf38136b770e6
Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date:   Thu Dec 21 12:51:26 2023 +0100

    ld: Add lib32 directories for 32-bit emulation on FreeBSD/amd64
   =20
    GNU ld currently fails to link 32-bit executables on FreeBSD/amd64 when
    the linked libraries have dependencies on shared objects themselves:
   =20
    $ gcc -m32 -o ei ei.c -lexecinfo
    /var/gcc/binutils/amd64/lib/gcc/amd64-pc-freebsd14.0/13.2.0/../../../..=
/amd64-pc-freebsd14.0/bin/ld:
    warning: libelf.so.2, needed by /usr/lib/../lib32/libexecinfo.so, not f=
ound
    (try using -rpath or -rpath-link)
    /var/gcc/binutils/amd64/lib/gcc/amd64-pc-freebsd14.0/13.2.0/../../../..=
/amd64-pc-freebsd14.0/bin/ld:
    /usr/lib/../lib32/libexecinfo.so: undefined reference to `elf_begin@R1.=
0'
    [...]
   =20
    Fixed by handling FreeBSD/amd64 like Linux/x86.
   =20
    Tested on amd64-pc-freebsd14.0.

Diff:
---
 ld/ChangeLog              | 5 +++++
 ld/emulparams/elf_i386.sh | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index cbcb29de0a0..82cb270de06 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* emulparams/elf_i386.sh (LIBPATH_SUFFIX, LIBPATH_SUFFIX_SKIP)
+	[x86_64*-freebsd*]: Set for i386 emulation.
+
 2023-12-12  Georg-Johann Lay  <avr@gjlay.de>
=20
 	PR 31124
diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
index ae17bb4b3f7..3f124356d02 100644
--- a/ld/emulparams/elf_i386.sh
+++ b/ld/emulparams/elf_i386.sh
@@ -39,4 +39,12 @@ case "$target" in
 	;;
     esac
     ;;
+  x86_64*-freebsd*)
+    case "$EMULATION_NAME" in
+      *i386*)
+	LIBPATH_SUFFIX=3D32
+	LIBPATH_SUFFIX_SKIP=3D64
+	;;
+    esac
+    ;;
 esac