Re: [PATCH] Avoid redefinition of FUNC near __floatundisf and __floatundidf

[Bernhard Reutner-Fischer <rep dot dot dot nop at gmail dot com>]

On Fri, Jun 05, 2009 at 05:26:03PM -0700, Ian Lance Taylor wrote:
>Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> writes:
>
>> 	* libgcc2.c (__floatundisf, __floatundidf): Avoid redefinition of
>> 	FUNC by renaming it to FUNCU.
>
>What problem are you fixing with this patch?  I don't understand when
>FUNC would ever get redefined.

I have a patch that builds libgcc with --enable-intermodule (i.e. --combine)
where redefinition triggers.
>
>Ian
>
>> diff --git a/gcc/ChangeLog b/gcc/ChangeLog
>> index bdc4bae..f742c3d 100644
>> --- a/gcc/ChangeLog
>> +++ b/gcc/ChangeLog
>> @@ -1,5 +1,10 @@
>>  2009-06-04  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
>>  
>> +	* libgcc2.c (__floatundisf, __floatundidf): Avoid redefinition of
>> +	FUNC by renaming it to FUNCU.
>> +
>> +2009-06-04  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
>> +
>>  	* gbl-ctors.h: Add header guard.
>>  
>>  2009-06-04  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
>> diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
>> index 4097d3e..8dd9844 100644
>> --- a/gcc/libgcc2.c
>> +++ b/gcc/libgcc2.c
>> @@ -1534,17 +1534,17 @@ FUNC (DWtype u)
>>     && SIZE > (DI_SIZE - SIZE + FSSIZE)					\
>>     && !AVOID_FP_TYPE_CONVERSION(SIZE))
>>  #if defined(L_floatundisf)
>> -#define FUNC __floatundisf
>> +#define FUNCU __floatundisf
>>  #define FSTYPE SFtype
>>  #define FSSIZE SF_SIZE
>>  #else
>> -#define FUNC __floatundidf
>> +#define FUNCU __floatundidf
>>  #define FSTYPE DFtype
>>  #define FSSIZE DF_SIZE
>>  #endif
>>  
>>  FSTYPE
>> -FUNC (UDWtype u)
>> +FUNCU (UDWtype u)
>>  {
>>  #if FSSIZE >= W_TYPE_SIZE
>>    /* When the word size is small, we never get any rounding error.  */