Re: RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants

["H.J. Lu" <hjl.tools@gmail.com>]

On Fri, Jun 1, 2012 at 8:06 AM, Joseph S. Myers <joseph@codesourcery.com> wrote:
> On Fri, 1 Jun 2012, H.J. Lu wrote:
>
>> > Here is the (untested) patch I propose to add the default-abi definitions
>> > so that these architectures again install the correct stubs-<abi>.h
>> > instead of "stubs-.h".
>>
>> Can you also remove
>>
>> ifdef abi-variants
>> ifndef default-abi
>> default-abi = $(firstword $(abi-variants))
>> endif
>> endif
>>
>> in Makeconfig?
>
> Here is a patch for that.  Tested x86_64.
>
> 2012-06-01  Joseph Myers  <joseph@codesourcery.com>
>
>        * Makeconfig [abi-variants && !default-abi] (default-abi): Remove
>        definition.  Document in comment.
>
> diff --git a/Makeconfig b/Makeconfig
> index df7545f..cba5db7 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -797,13 +797,8 @@ ifeq (yes, $(build-shared))
>  # defines abi-$(variant)-condition to be the condition for those options
>  # to use in a C #if condition.  abi-includes may be defined to a list of
>  # headers to include in the generated header, if the default does not
> -# suffice.
> -
> -ifdef abi-variants
> -ifndef default-abi
> -default-abi = $(firstword $(abi-variants))
> -endif
> -endif
> +# suffice.  default-abi is defined to be the ABI for the current glibc
> +# build.
>
>  ifndef abi-includes
>  abi-includes := bits/wordsize.h
>

Looks good to me.

Thanks.

-- 
H.J.