Re: [Qemu-devel] Build failure on OS X

["Andreas Färber" <andreas.faerber@web.de>]

[-- Attachment #1: Type: text/plain, Size: 1786 bytes --]


Am 30.09.2007 um 14:17 schrieb J. Mayer:

> On Sun, 2007-09-30 at 14:05 +0200, Andreas Färber wrote:
>> Hi,
>>
>> Am 30.09.2007 um 13:45 schrieb J. Mayer:
>>
>>>> Anyone any idea what might've caused this build failure? I'm fairly
>>>> certain I haven't messed with or updated the system headers.
>>>
>>> have you just updated your CVS co ?
>>
>> Yes.
>>
>>> Please try to comment the "always_inline" definition in vl.h /
>>> exec-all.h.
>>> If this is what's breaking your build, I'll revert this definition.
>>
>> It is, thanks for the pointer! (The source file itself didn't appear
>> to have been updated.)
>>
>>>> With line 284 of math.h reading:
>>>> 		static __inline__ int __inline_isfinitef	(float      )
>>>> __MATH_H_ALWAYS_INLINE__;
>>>
>>> The fact the error mentions "__attribute__" and ALWAYS_INLINE  
>>> make me
>>> think the always_inline defintion is the suspect here....
>>
>> I believe Apple's GCC in general has a problem with the __attribute__
>> notation. The ppc*-softmmu fail to build for some time due to its use
>> for aliasing in hw/ppc.c. Maybe we could add a configure check for
>> this feature to have a conditional define? That would allow a more
>> elegant fix than the one I use locally and had previously suggested.
>
> Sorry for introducing this problem...
> Would this new definition solve the compilation failure ?
>
> #ifndef always_inline
> #if (__GNUC__ < 3) || defined(__APPLE__)
> #define always_inline inline
> #else
> #define always_inline __attribute__ (( always_inline )) inline
> #endif
> #endif

It does.

I've updated my patch accordingly with __APPLE__, what do you think?  
I have no idea what alias does exactly, should we just use a #define  
on the Mac?

Regards,

Andreas

[-- Attachment #2: ppc.c-2007-09-30.diff --]
[-- Type: application/octet-stream, Size: 362 bytes --]

Index: hw/ppc.c
===================================================================
RCS file: /sources/qemu/qemu/hw/ppc.c,v
retrieving revision 1.27
diff -r1.27 ppc.c
740a741,745
> #ifdef __APPLE__
> {
> 	cpu_ppc_store_tbu(env, value);
> }
> #else
741a747
> #endif
743a750,754
> #ifdef __APPLE__
> {
> 	return cpu_ppc_load_tbu(env);
> }
> #else
744a756
> #endif