From e15c905782c4ea97c858d0cae3b05ec744d01bbf Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Mon, 1 Feb 2016 20:22:43 +0000 Subject: [PATCH] re PR target/68741 (FAIL: tr1/8_c_compatibility/cstdio/functions.cc (test for excess errors)) PR target/68741 * inclhack.def (hpux_vsscanf): New fix. * fixincl.x: Regenerated. * tests/base/stdio.h [HPUX_VSSCANF_CHECK]: New test. From-SVN: r233047 --- fixincludes/ChangeLog | 7 +++++++ fixincludes/inclhack.def | 14 ++++++++++++++ fixincludes/tests/base/stdio.h | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 4e0a4c6b1718..55cbe58d6e7c 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,10 @@ +2016-02-01 John David Anglin + + PR target/68741 + * inclhack.def (hpux_vsscanf): New fix. + * fixincl.x: Regenerated. + * tests/base/stdio.h [HPUX_VSSCANF_CHECK]: New test. + 2015-12-04 Release Manager * GCC 5.3.0 released. diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index fc72add35dc7..8b6d1fe3a135 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2272,6 +2272,20 @@ fix = { ' __va__list);'; }; +/* + * Fix missing const in hpux vsscanf declaration + */ +fix = { + hackname = hpux_vsscanf; + mach = "*-*-hpux*"; + files = stdio.h; + select = '(extern int vsscanf\()char'; + c_fix = format; + c_fix_arg = "%1const char"; + + test_text = 'extern int vsscanf(char *, const char *, __va_list);'; +}; + /* * get rid of bogus inline definitions in HP-UX 8.0 */ diff --git a/fixincludes/tests/base/stdio.h b/fixincludes/tests/base/stdio.h index 275931c52ccd..4ca4fafeb951 100644 --- a/fixincludes/tests/base/stdio.h +++ b/fixincludes/tests/base/stdio.h @@ -59,6 +59,11 @@ extern int vsnprintf(char *, _hpux_size_t, const char *, __gnuc_va_list); #endif /* HPUX11_VSNPRINTF_CHECK */ +#if defined( HPUX_VSSCANF_CHECK ) +extern int vsscanf(const char *, const char *, __gnuc_va_list); +#endif /* HPUX_VSSCANF_CHECK */ + + #if defined( IRIX_STDIO_DUMMY_VA_LIST_CHECK ) extern int printf( const char *, __gnuc_va_list ); #endif /* IRIX_STDIO_DUMMY_VA_LIST_CHECK */