From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 36C173858D32; Sun, 22 Jan 2023 09:33:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36C173858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674379993; bh=A4ivw9hOSuxznZs9UuQh3RiOQw8paoHYfiwL8DEg7Ts=; h=From:To:Subject:Date:From; b=Xzn9Lg/u4InqNVcOBiL73CwnjFQDMMF6NRQsnI0sAdLzrCaX/E0uLF+MSTYYOkn4I FqhftSEfXBnbFxMf4wgOcqrQJgHKjSbriS//qaYQi0v1PFf8s3qlGiPiduwUEsnIk6 mNoMBHUvLWb145CROpfKXvkKl5efNxaEMerz0UdU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5278] Darwin, libffi, testsuite: Ensure we pick up the convenience lib. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/master X-Git-Oldrev: d5717e7f6fd5a13356ebc46c3b54e081a99dd826 X-Git-Newrev: e4703bd0e15b4ed6e5eae36604b28bd4ca4f8cee Message-Id: <20230122093313.36C173858D32@sourceware.org> Date: Sun, 22 Jan 2023 09:33:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e4703bd0e15b4ed6e5eae36604b28bd4ca4f8cee commit r13-5278-ge4703bd0e15b4ed6e5eae36604b28bd4ca4f8cee Author: Iain Sandoe Date: Sat Jan 21 19:52:58 2023 +0000 Darwin, libffi, testsuite: Ensure we pick up the convenience lib. For several Darwin linker versions, the link paths are first traversed looking for shared libraries, and then again looking for archives. We want the paths to be searched for both shared and archives in order so that we will find the non-shared libffi in the testsuite (otherwise the installed version in the system will be found instead). Signed-off-by: Iain Sandoe libffi/ChangeLog: * testsuite/lib/libffi.exp: Search for both shared and archive in each path in turn. Diff: --- libffi/testsuite/lib/libffi.exp | 1 + 1 file changed, 1 insertion(+) diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp index 7dc7b5d19a3..15d3d5ebd73 100644 --- a/libffi/testsuite/lib/libffi.exp +++ b/libffi/testsuite/lib/libffi.exp @@ -384,6 +384,7 @@ proc libffi_target_compile { source dest type options } { if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] || [istarget "*-*-darwin2*"] } { lappend options "additional_flags=-Wl,-allow_stack_execute" + lappend options "additional_flags=-Wl,-search_paths_first" } # If you're building the compiler with --prefix set to a place