Fix build with inhibit_libc (was Re: [PATCH 2/4] Implement N disk counters for single value and indirect call counters.)

[Martin Liška]

On 6/10/19 11:53 PM, Jakub Jelinek wrote:
> On Mon, Jun 10, 2019 at 08:02:26PM +0200, Jakub Jelinek wrote:
>> This change broke build without target libc.
>>
>> ../../../../libgcc/libgcov-merge.c:37:6: error: conflicting types for ‘__gcov_merge_single’
>>    37 | void __gcov_merge_single (gcov_type *counters  __attribute__ ((unused)))
>>       |      ^~~~~~~~~~~~~~~~~~~
>> In file included from ../../../../libgcc/libgcov-merge.c:26:
>> ../../../../libgcc/libgcov.h:263:13: note: previous declaration of ‘__gcov_merge_single’ was here
>>   263 | extern void __gcov_merge_single (gcov_type *, unsigned) ATTRIBUTE_HIDDEN;
>>       |             ^~~~~~~~~~~~~~~~~~~
>>
>> It is unclear why it has been changed, when the callers haven't been
>> adjusted, nor the prototype.
>>
>> So, I'd like to revert this hunk.  Tested with x86_64-linux -> nvptx-none
>> cross build, ok for trunk?
> 
> Additionally successfully bootstrapped/regtested on x86_64-linux.

Thank you for the patch. It's correct, I really accidentally changed the signature.

Martin

> 
>> 2019-06-10  Jakub Jelinek  <jakub@redhat.com>
>>
>> 	* libgcov-merge.c (__gcov_merge_single): Revert previous change.
>>
>> --- libgcc/libgcov-merge.c.jj	2019-06-10 19:39:29.291363550 +0200
>> +++ libgcc/libgcov-merge.c	2019-06-10 19:58:36.731524778 +0200
>> @@ -34,9 +34,8 @@ void __gcov_merge_add (gcov_type *counte
>>  #endif
>>  
>>  #ifdef L_gcov_merge_single
>> -void __gcov_merge_single (gcov_type *counters  __attribute__ ((unused)))
>> -{
>> -}
>> +void __gcov_merge_single (gcov_type *counters  __attribute__ ((unused)),
>> +			  unsigned n_counters __attribute__ ((unused))) {}
>>  #endif
>>  
>>  #else
> 
> 	Jakub
>