ldbl-128ibm-compat: Add *cvt functions

This patch adds IEEE long double versions of q*cvt* functions for
powerpc64le.  Unlike all other long double to/from string conversion
functions, these do not rely on internal functions that can take
floating-point numbers with different formats and act on them
accordingly, instead, the related files are rebuilt with the
-mabi=ieeelongdouble compiler flag set.

Having -mabi=ieeelongdouble passed to the compiler causes the object
files to be marked with a .gnu_attribute that is incompatible with the
.gnu_attribute in files built with -mabi=ibmlongdouble (the default).
The difference causes error messages similar to the following:

  ld: libc_pic.a(s_isinfl.os) uses IBM long double,
      libc_pic.a(ieee128-qefgcvt_r.os) uses IEEE long double.
  collect2: error: ld returned 1 exit status
  make[2]: *** [../Makerules:649: libc_pic.os] Error 1

Although this warning is useful in other situations, the library
actually needs to have functions with different long double formats, so
.gnu_attribute generation is explicitly disabled for these files with
the use of -mno-gnu-attribute.

Tested for powerpc64le on the branch that actually enables the
sysdeps/ieee754/ldbl-128ibm-compat for powerpc64le.

Reviewed-by: Paul E. Murphy <murphyp@linux.ibm.com>
This commit is contained in:
Gabriel F. T. Gomes 2019-07-11 11:48:24 -03:00
parent dce4253411
commit 3021e78178
6 changed files with 113 additions and 3 deletions

View File

@ -23,6 +23,10 @@
#include <libc-lock.h>
#include <math_ldbl_opt.h>
#ifndef SPRINTF
# define SPRINTF sprintf
#endif
#define APPEND(a, b) APPEND2 (a, b)
#define APPEND2(a, b) a##b
@ -66,6 +70,6 @@ __ECVT (FLOAT_TYPE value, int ndigit, int *decpt, int *sign)
char *
__GCVT (FLOAT_TYPE value, int ndigit, char *buf)
{
sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
SPRINTF (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
return buf;
}

View File

@ -25,6 +25,10 @@
#include <sys/param.h>
#include <math_ldbl_opt.h>
#ifndef SNPRINTF
# define SNPRINTF __snprintf
#endif
#define APPEND(a, b) APPEND2 (a, b)
#define APPEND2(a, b) a##b
@ -73,7 +77,7 @@ __FCVT_R (FLOAT_TYPE value, int ndigit, int *decpt, int *sign,
/* Value is Inf or NaN. */
*sign = 0;
n = __snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", MIN (ndigit, NDIGIT_MAX),
n = SNPRINTF (buf, len, "%.*" FLOAT_FMT_FLAG "f", MIN (ndigit, NDIGIT_MAX),
value);
/* Check for a too small buffer. */
if (n >= (ssize_t) len)

View File

@ -251,10 +251,18 @@ endif
ifeq ($(subdir),misc)
ldbl-extra-routines += err \
error \
syslog
syslog \
qefgcvt \
qefgcvt_r
CFLAGS-ieee128-qefgcvt.c += -mabi=ieeelongdouble -Wno-psabi -mno-gnu-attribute
CFLAGS-ieee128-qefgcvt_r.c += -mabi=ieeelongdouble -Wno-psabi -mno-gnu-attribute
tests-internal += tst-ibm128-warn tst-ieee128-warn
tests-internal += tst-ibm128-error tst-ieee128-error
tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt
$(objpfx)tst-ieee128-efgcvt: gnulib-tests += $(f128-loader-link)
$(objpfx)tst-ibm128-%.c: tst-ldbl-%.c
cp $< $@
@ -264,9 +272,11 @@ $(objpfx)tst-ieee128-%.c: tst-ldbl-%.c
CFLAGS-tst-ibm128-warn.c += -mabi=ibmlongdouble -Wno-psabi
CFLAGS-tst-ibm128-error.c += -mabi=ibmlongdouble -Wno-psabi
CFLAGS-tst-ibm128-efgcvt.c += -mabi=ibmlongdouble -Wno-psabi
CFLAGS-tst-ieee128-warn.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
CFLAGS-tst-ieee128-error.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
CFLAGS-tst-ieee128-efgcvt.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi
tests-container += test-syslog-ieee128 test-syslog-ibm128
CFLAGS-test-syslog-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi

View File

@ -224,5 +224,11 @@ libc {
__strfmonieee128;
__strfmon_lieee128;
__qecvtieee128;
__qfcvtieee128;
__qgcvtieee128;
__qecvtieee128_r;
__qfcvtieee128_r;
}
}

View File

@ -0,0 +1,52 @@
/* IEEE binary128 versions of *cvt functions.
Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* When in IEEE long double mode, call ___ieee128_sprintf. */
#include <stdio.h>
typeof (sprintf) ___ieee128_sprintf attribute_hidden;
#define SPRINTF ___ieee128_sprintf
/* Declare internal functions: ___qecvtieee128_r and ___qfcvtieee128_r,
built from a different compiling unit, and called from here. */
#include <stdlib.h>
typeof (qecvt_r) ___qecvtieee128_r;
typeof (qfcvt_r) ___qfcvtieee128_r;
/* Rename the static buffers and pointer, otherwise the IEEE long double
variants of qecvt and qfcvt would reuse the same buffers and pointer
as their non-IEEE long double counterparts. */
#define qecvt_buffer qecvtieee128_buffer
#define qfcvt_buffer qfcvtieee128_buffer
#define qfcvt_bufptr qfcvtieee128_bufptr
#define ECVT __qecvtieee128
#define FCVT __qfcvtieee128
#define GCVT __qgcvtieee128
#define __ECVT ___qecvtieee128
#define __FCVT ___qfcvtieee128
#define __GCVT ___qgcvtieee128
#define __ECVT_R ___qecvtieee128_r
#define __FCVT_R ___qfcvtieee128_r
#include <efgcvt-ldbl-macros.h>
#include <efgcvt-template.c>
#define cvt_symbol(local, symbol) \
strong_alias (local, symbol)
cvt_symbol (___qfcvtieee128, __qfcvtieee128);
cvt_symbol (___qecvtieee128, __qecvtieee128);
cvt_symbol (___qgcvtieee128, __qgcvtieee128);

View File

@ -0,0 +1,34 @@
/* IEEE binary128 versions of reentrant *cvt_r functions.
Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* When in IEEE long double mode, call ___ieee128_snprintf. */
#include <stdio.h>
typeof (snprintf) ___ieee128_snprintf attribute_hidden;
#define SNPRINTF ___ieee128_snprintf
#define ECVT_R __qecvtieee128_r
#define FCVT_R __qfcvtieee128_r
#define __ECVT_R ___qecvtieee128_r
#define __FCVT_R ___qfcvtieee128_r
#include <efgcvt-ldbl-macros.h>
#include <efgcvt_r-template.c>
#define cvt_symbol(local, symbol) \
strong_alias (local, symbol)
cvt_symbol (___qfcvtieee128_r, __qfcvtieee128_r);
cvt_symbol (___qecvtieee128_r, __qecvtieee128_r);