diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2015-12-15 10:44:46 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2015-12-15 14:41:45 +0100 |
| commit | 966a7fddb78c4fad3c2efb46c969308686557ec0 (patch) | |
| tree | ed597a56f1ed08195ec07841c5608cf4d2945a47 /libgfortran | |
| parent | 7f7da9776a2100eb6e64c142732c89ecc719d45d (diff) | |
Merge branches/gcc-5-branch rev 231642.
Change-Id: I58832e31b4e58588e1d0800c3fc09a01f91b6320
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 10 | ||||
| -rw-r--r-- | libgfortran/io/write_float.def | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c6d4341b4d0..7a186377f79 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,13 @@ +2015-12-05 Juoko Orava <jouko.orava@iki.fi> + + PR fortran/50201 + * io/write_float.def: Avoid marking quadmath_snprintf as an untyped + weak reference, which fixing linking with -static. + +2015-12-04 Release Manager + + * GCC 5.3.0 released. + 2015-11-07 Jerry DeLisle <jvdelisle@gcc.gnu.org> Backport from trunk diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def index 1bbe0160619..b983c784498 100644 --- a/libgfortran/io/write_float.def +++ b/libgfortran/io/write_float.def @@ -938,7 +938,7 @@ snprintf (buffer, size, "%+-#.*Le", (prec), (val)) #if defined(GFC_REAL_16_IS_FLOAT128) #define DTOA2Q(prec,val) \ -__qmath_(quadmath_snprintf) (buffer, size, "%+-#.*Qe", (prec), (val)) +quadmath_snprintf (buffer, size, "%+-#.*Qe", (prec), (val)) #endif #define FDTOA(suff,prec,val) TOKENPASTE(FDTOA2,suff)(prec,val) @@ -953,7 +953,7 @@ snprintf (buffer, size, "%+-#.*Lf", (prec), (val)) #if defined(GFC_REAL_16_IS_FLOAT128) #define FDTOA2Q(prec,val) \ -__qmath_(quadmath_snprintf) (buffer, size, "%+-#.*Qf", \ +quadmath_snprintf (buffer, size, "%+-#.*Qf", \ (prec), (val)) #endif |