AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-11 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ldbl-opt: Add error and error_at_line (bug 23984)

Browse Source 
On platforms where long double may have the same format as double
(-mlong-double-64), error and error_at_line do not take that into
account and might produce wrong output if a long double conversion is
requested by the format string ('%Lf').  This patch adds compatibility
functions for this situation and redirects calls via header magic.

Tested for powerpc, powerpc64 and powerpc64le.
This commit is contained in:
Gabriel F. T. Gomes 2018-08-08 17:26:22 -03:00
parent 90188e7d1a
commit d11086a939
17 changed files with 120 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -1,3 +1,32 @@
2019-03-01 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
[BZ #23984]
* include/bits/error-ldbl.h: New file.
* include/error.h: Include stdarg.h. Declare internal functions
__error_internal and __error_at_line_internal.
* misc/Makefile (headers): Add bits/error-ldbl.h.
* misc/bits/error-ldbl.h: New file.
* misc/error.h [__LDBL_COMPAT]: Include bits/error-ldbl.h and
avoid the inclusion of bits/error.h.
* sysdeps/ieee754/ldbl-opt/Versions (libc): Add __nldbl_error,
and __nldbl_error_at_line.
* sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Include error.h.
(__nldbl_error, __ndlbl_error_at_line): New functions.
* sysdeps/ieee754/ldbl-opt/nldbl-compat.h: Include error.h.
Redirect error and error_at_line.
* sysdeps/unix/sysv/linux/alpha/libc.abilist: Update.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist: Likewise.
2019-03-01 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
[BZ #23984]

1
include/bits/error-ldbl.h Normal file
View File

@ -0,0 +1 @@
#include <misc/bits/error-ldbl.h>

14
include/error.h
View File

@ -1 +1,15 @@
#ifndef _ERROR_H
#include <misc/error.h>
#include <stdarg.h>
void
__error_internal (int status, int errnum, const char *message,
va_list args, unsigned int mode_flags);
void
__error_at_line_internal (int status, int errnum, const char *file_name,
unsigned int line_number, const char *message,
va_list args, unsigned int mode_flags);
#endif

2
misc/Makefile
View File

@ -37,7 +37,7 @@ headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \
bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
bits/select2.h bits/hwcap.h sys/auxv.h \
sys/sysmacros.h bits/sysmacros.h bits/types/struct_iovec.h \
bits/err-ldbl.h
bits/err-ldbl.h bits/error-ldbl.h
routines := brk sbrk sstk ioctl \
readv writev preadv preadv64 pwritev pwritev64 \

24
misc/bits/error-ldbl.h Normal file
View File

@ -0,0 +1,24 @@
/* Redirections for error.h functions for -mlong-double-64.
Copyright (C) 2019 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
<http://www.gnu.org/licenses/>. */
#ifndef _ERROR_H
# error "Never include <bits/error-ldbl.h> directly; use <error.h> instead."
#endif
__LDBL_REDIR_DECL (error)
__LDBL_REDIR_DECL (error_at_line)

12
misc/error.h
View File

@ -47,9 +47,15 @@ extern unsigned int error_message_count;
variable controls whether this mode is selected or not. */
extern int error_one_per_line;
#if defined __extern_always_inline && defined __va_arg_pack
# include <bits/error.h>
#ifdef __LDBL_COMPAT
# include <bits/error-ldbl.h>
#else
/* Do not inline error and error_at_line when long double has the same
size of double, because that would invalidate the redirections to the
compatibility functions. */
# if defined __extern_always_inline && defined __va_arg_pack
# include <bits/error.h>
# endif
#endif
__END_DECLS

1
sysdeps/ieee754/ldbl-opt/Versions
View File

@ -82,6 +82,7 @@ libc {
__nldbl_argp_error; __nldbl_argp_failure;
__nldbl_warn; __nldbl_vwarn; __nldbl_warnx; __nldbl_vwarnx;
__nldbl_err; __nldbl_verr; __nldbl_errx; __nldbl_verrx;
__nldbl_error; __nldbl_error_at_line;
}
}
libm {

22
sysdeps/ieee754/ldbl-opt/nldbl-compat.c
View File

@ -24,6 +24,7 @@
#include <argp.h>
#include <err.h>
#include <error.h>
#include <stdarg.h>
#include <stdio.h>
#include <libio/strfile.h>
@ -1072,6 +1073,27 @@ __nldbl_vwarnx (const char *format, __gnuc_va_list ap)
__vwarnx_internal (format, ap, PRINTF_LDBL_IS_DBL);
}
void
__nldbl_error (int status, int errnum, const char *message, ...)
{
va_list ap;
va_start (ap, message);
__error_internal (status, errnum, message, ap, PRINTF_LDBL_IS_DBL);
va_end (ap);
}
void
__nldbl_error_at_line (int status, int errnum, const char *file_name,
unsigned int line_number, const char *message,
...)
{
va_list ap;
va_start (ap, message);
__error_at_line_internal (status, errnum, file_name, line_number,
message, ap, PRINTF_LDBL_IS_DBL);
va_end (ap);
}
#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __nldbl__IO_printf, _IO_printf, GLIBC_2_0);
compat_symbol (libc, __nldbl__IO_sprintf, _IO_sprintf, GLIBC_2_0);

3
sysdeps/ieee754/ldbl-opt/nldbl-compat.h
View File

@ -28,6 +28,7 @@
#define __NO_LONG_DOUBLE_MATH 1
#include <argp.h>
#include <err.h>
#include <error.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdint.h>
@ -88,6 +89,8 @@ NLDBL_DECL (err);
NLDBL_DECL (verr);
NLDBL_DECL (errx);
NLDBL_DECL (verrx);
NLDBL_DECL (error);
NLDBL_DECL (error_at_line);
/* These do not exist in the normal interface, but must exist in the
__nldbl interface so that they can be called from libnldbl. */

2
sysdeps/unix/sysv/linux/alpha/libc.abilist
View File

@ -2207,6 +2207,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
View File

@ -2167,6 +2167,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
View File

@ -2200,6 +2200,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
View File

@ -2030,6 +2030,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
View File

@ -2234,6 +2234,8 @@ GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
View File

@ -2162,6 +2162,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
View File

@ -2066,6 +2066,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F

2
sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
View File

@ -2156,6 +2156,8 @@ GLIBC_2.3.4 xdr_u_quad_t F
GLIBC_2.30 __nldbl_argp_error F
GLIBC_2.30 __nldbl_argp_failure F
GLIBC_2.30 __nldbl_err F
GLIBC_2.30 __nldbl_error F
GLIBC_2.30 __nldbl_error_at_line F
GLIBC_2.30 __nldbl_errx F
GLIBC_2.30 __nldbl_verr F
GLIBC_2.30 __nldbl_verrx F