From f14aa1018632475a7c24bbce87ef581e5d987a58 Mon Sep 17 00:00:00 2001
From: Yuri Pankov <yuri.pankov@nexenta.com>
Date: Sat, 5 Nov 2016 05:26:47 +0300
Subject: 16 update cmn_err format specifier Reviewed by: Richard
Lowe <richlowe@richlowe.net> Reviewed by: Robert Mustacchi <rm@joyent.com>
---
gcc/config/sol2-c.cc | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gcc/config/sol2-c.cc b/gcc/config/sol2-c.cc
index f2f3ae5f5bbe..604766bb2cd1 100644
--- a/gcc/config/sol2-c.cc
+++ b/gcc/config/sol2-c.cc
@@ -40,7 +40,10 @@ static const format_length_info cmn_err_length_specs[] =
static const format_flag_spec cmn_err_flag_specs[] =
{
+ { '0', 0, 0, 0, N_("'0' flag"), N_("the '0' flag"), STD_C89 },
+ { '-', 0, 0, 0, N_("'-' flag"), N_("the '-' flag"), STD_C89 },
{ 'w', 0, 0, 0, N_("field width"), N_("field width in printf format"), STD_C89 },
+ { 'p', 0, 0, 0, N_("precision"), N_("precision in printf format"), STD_C89 },
{ 'L', 0, 0, 0, N_("length modifier"), N_("length modifier in printf format"), STD_C89 },
{ 0, 0, 0, 0, NULL, NULL, STD_C89 }
};
@@ -48,6 +51,7 @@ static const format_flag_spec cmn_err_flag_specs[] =
static const format_flag_pair cmn_err_flag_pairs[] =
{
+ { '0', '-', 1, 0 },
{ 0, 0, 0, 0 }
};
@@ -57,21 +61,21 @@ static const format_char_info bitfield_string_type =
static const format_char_info cmn_err_char_table[] =
{
/* C89 conversion specifiers. */
- { "dD", 0, STD_C89, { T89_I, BADLEN, BADLEN, T89_L, T9L_LL, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "", NULL },
- { "oOxX",0, STD_C89, { T89_UI, BADLEN, BADLEN, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "", NULL },
- { "u", 0, STD_C89, { T89_UI, BADLEN, BADLEN, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "", NULL },
- { "c", 0, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "", NULL },
- { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "c", NULL },
- { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "cR", NULL },
- { "b", 0, STD_C89, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "w", "", &bitfield_string_type },
+ { "dD", 0, STD_C89, { T89_I, BADLEN, BADLEN, T89_L, T9L_LL, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL },
+ { "oOxX",0, STD_C89, { T89_UI, BADLEN, BADLEN, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL },
+ { "u", 0, STD_C89, { T89_UI, BADLEN, BADLEN, T89_UL, T9L_ULL, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0", "", NULL },
+ { "c", 0, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c", NULL },
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
+ { "b", 0, STD_C89, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", &bitfield_string_type },
{ NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
};
EXPORTED_CONST format_kind_info solaris_format_types[] = {
- { "cmn_err", cmn_err_length_specs, cmn_err_char_table, "", NULL,
+ { "cmn_err", cmn_err_length_specs, cmn_err_char_table, "0-", NULL,
cmn_err_flag_specs, cmn_err_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
- 'w', 0, 0, 0, 'L', 0,
+ 'w', 0, 'p', 0, 'L', 0,
&integer_type_node, &integer_type_node
}
};