Alan Modra <amodra@gmail.com> writes:

> On Mon, Aug 07, 2023 at 01:07:10PM +0200, Arsen Arsenović via Binutils wrote:
>> From: Iain Sandoe <iain@sandoe.co.uk>
>> 
>> We do not use the shared libffi libraray, nor do we install it.
>> However, on at least Darwin, the shared version will be picked
>> up for testing, so it is preferrable not to build it.
>> 
>> Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
>> 
>> ChangeLog:
>> 
>> 	* Makefile.def: Do not build shared libffi.
>> 	* Makefile.in: Regenerate.
>> ---
>>  Makefile.def |   4 +-
>>  Makefile.in  | 511 +--------------------------------------------------
>>  2 files changed, 3 insertions(+), 512 deletions(-)
>> 
>> diff --git a/Makefile.def b/Makefile.def
>> index 2f51f83b043..8f5a5bb1c9e 100644
>> --- a/Makefile.def
>> +++ b/Makefile.def
>> @@ -187,8 +187,8 @@ target_modules = { module= libtermcap; no_check=true;
>>                     missing=maintainer-clean; };
>>  target_modules = { module= winsup; };
>>  target_modules = { module= libgloss; no_check=true; };
>> -target_modules = { module= libffi; no_install=true; };
>> -target_modules = { module= zlib; };
>> +target_modules = { module= libffi; no_install=true;
>> +                   extra_configure_flags='--disable-shared --with-pic'; };
>>  target_modules = { module= rda; };
>>  target_modules = { module= libada; };
>>  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
>
> This one does more than the corresponding gcc patch, removing zlib
> too.  Hmm, you add back zlib in PATCH 36/45 so something went wrong
> here.

Hmm, that's odd.  Probably an error during conflict resolution.  I'll
amend locally.
-- 
Arsen Arsenović