Re: [Qemu-devel] gnu-c99-math.h file

[Ben Taylor <sol10x86@cox.net>]

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


---- Chris Bagwell <chris@cnpbagwell.com> wrote: 
> I just upgraded to current CVS to get all the changes submitted today.  
> The solaris port commits seems to have added a #include "gnu-c99-math.h" 
> file to fpu/softfloat-native.h.

Apologies.  That should have been isolated with a 

#ifdef __sun__
#include "gnu-c99-math.h"
#endif

> 
> This file doesn't exist on my Fedora Core 5 system with gcc32 installed 
> for compatibility.  The mailing archive mentions something about this 
> missing file being a custom file for the solaris port. Should that file 
> only be referenced under solaris?

correct.  I rechecked the patch  I sent to Fabrice and the gnu-c99-math.h 
file is there.  

> Qemu appears to compile fine on linux if I just comment that line out.
> 
> Chris

The following patch and file will correct the issue for solaris and non-solaris
system alike.

Fabrice - can we get this added to CVS?

Regards,

Ben

[-- Attachment #2: fpu-softfloat-patch.diff --]
[-- Type: application/octet-stream, Size: 104 bytes --]

5a6
> #if !defined(_PRESOLARIS10)
7a9,12
> #endif
> #ifdef __sun__
> #include "gnu-c99-math.h"
> #endif

[-- Attachment #3: gnu-c99-math.h --]
[-- Type: application/octet-stream, Size: 651 bytes --]

#if defined(__sun__) && defined(__GNUC__)

/*
 * C99 7.12.3 classification macros
 * and
 * C99 7.12.14 comparison macros
 *
 * ... do not work on Solaris 10 using GNU CC 3.4.x.
 * Try to workaround the missing / broken C99 math macros.
 */
#include <ieeefp.h>

#define isnormal(x)             (fpclass(x) >= FP_NZERO)

#define isgreater(x, y)         ((!unordered(x, y)) && ((x) > (y)))
#define isgreaterequal(x, y)    ((!unordered(x, y)) && ((x) >= (y)))
#define isless(x, y)            ((!unordered(x, y)) && ((x) < (y)))
#define islessequal(x, y)       ((!unordered(x, y)) && ((x) <= (y)))

#define isunordered(x,y)        unordered(x, y)

#endif