svn commit: r338861 - head/lib/libc

[Ed Maste]

On 21 September 2018 at 16:11, Xin Li <delphij at delphij.net> wrote:
> On 9/21/18 10:49, Ed Maste wrote:
>> Author: emaste
>> Date: Fri Sep 21 17:49:37 2018
>> New Revision: 338861
>> URL: https://svnweb.freebsd.org/changeset/base/338861
>>
>> Log:
>>   libc: require ifunc-capable linker for amd64/i386
>>
>>   We expect to introduce optimized libc routines in the near future,
>>   which requires use of a linker that supports ifuncs.
>>
>>   Approved by:        re (gjb, kib)
>>   Sponsored by:   The FreeBSD Foundation
>>
>> Modified:
>>   head/lib/libc/Makefile
>>
>> Modified: head/lib/libc/Makefile
>> ==============================================================================
>> --- head/lib/libc/Makefile    Fri Sep 21 17:44:05 2018        (r338860)
>> +++ head/lib/libc/Makefile    Fri Sep 21 17:49:37 2018        (r338861)
>> @@ -21,6 +21,11 @@ LIBC_ARCH=${MACHINE_ARCH}
>>  LIBC_ARCH=${MACHINE_CPUARCH}
>>  .endif
>>
>> +.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
>> +    defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
>> +.error ${LIBC_ARCH} libc requires linker ifunc support
>> +.endif
>> +
>>  # All library objects contain FreeBSD revision strings by default; they may be
>>  # excluded as a space-saving measure.  To produce a library that does
>>  # not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
>
> It seems that this would break bootstraping from a FreeBSD -CURRENT
> before ifunc?

It looks like it needs to be made conditional on the make target as
well. I should have a fix tomorrow morning.