Commit 3bf7e40a authored by Avi Kivity's avatar Avi Kivity Committed by Blue Swirl
Browse files

softfloat: fix for C99 



C99 appears to consider compound literals as non-constants, and complains
when they are used in static initializers.  Switch to ordinary initializer
syntax.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Acked-by: default avatarAndreas Färber <afaerber@suse.de>
Reported-by: default avatarAndreas Färber <andreas.faerber@web.de>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 6344d922

fpu/softfloat-specialize.h

+4 −4
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ const float64 float64_default_nan = const_float64(LIT64( 0xFFF8000000000000 )); 
#define floatx80_default_nan_low  LIT64( 0xC000000000000000 )

#endif



const floatx80 floatx80_default_nan = make_floatx80(floatx80_default_nan_high,

                                                    floatx80_default_nan_low);

const floatx80 floatx80_default_nan

    = make_floatx80_init(floatx80_default_nan_high, floatx80_default_nan_low);



/*----------------------------------------------------------------------------

| The pattern for a default generated quadruple-precision NaN.  The `high' and
@@ -104,8 +104,8 @@ const floatx80 floatx80_default_nan = make_floatx80(floatx80_default_nan_high, 
#define float128_default_nan_low  LIT64( 0x0000000000000000 )

#endif



const float128 float128_default_nan = make_float128(float128_default_nan_high,

                                                    float128_default_nan_low);

const float128 float128_default_nan

    = make_float128_init(float128_default_nan_high, float128_default_nan_low);



/*----------------------------------------------------------------------------

| Raises the exceptions specified by `flags'.  Floating-point traps can be

fpu/softfloat.h

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ typedef struct { 
    uint16_t high;

} floatx80;

#define make_floatx80(exp, mant) ((floatx80) { mant, exp })

#define make_floatx80_init(exp, mant) { .low = mant, .high = exp }

typedef struct {

#ifdef HOST_WORDS_BIGENDIAN

    uint64_t high, low;
@@ -137,6 +138,7 @@ typedef struct { 
#endif

} float128;

#define make_float128(high_, low_) ((float128) { .high = high_, .low = low_ })

#define make_float128_init(high_, low_) { .high = high_, .low = low_ }



/*----------------------------------------------------------------------------

| Software IEC/IEEE floating-point underflow tininess-detection mode.