diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-09-27 16:24:48 +0000 |
|---|---|---|
| committer | Mark Mitchell <mark@codesourcery.com> | 2004-09-27 16:24:48 +0000 |
| commit | b19588b75d2982f652b2f17a962007a53b10c3ed (patch) | |
| tree | dafec7427ff9e830b7310031e38176430d088d1b | |
| parent | 0a9854242ba3088766af445a08fa48cac9a9aa54 (diff) | |
Revert:
2004-09-24 Mark Mitchell <mark@codesourcery.com>
* gcc/config/sol2-c.c (cmn_err_flag_specs): Add "#"
(cmn_err_char_table): Likewise.
(solaris_format_types): Likewise.
* gcc/testsuite/gcc.dg/format/cmn-err-1.c: Add "#" tests.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl-sol210-branch@88183 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rw-r--r-- | gcc/config/sol2-c.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/format/cmn-err-1.c | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index ef026937bcb..3d4f2c35441 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,5 +1,14 @@ 2004-09-24 Mark Mitchell <mark@codesourcery.com> + Revert: + 2004-09-24 Mark Mitchell <mark@codesourcery.com> + * gcc/config/sol2-c.c (cmn_err_flag_specs): Add "#" + (cmn_err_char_table): Likewise. + (solaris_format_types): Likewise. + * gcc/testsuite/gcc.dg/format/cmn-err-1.c: Add "#" tests. + +2004-09-24 Mark Mitchell <mark@codesourcery.com> + * gcc/config/i386/sol2-10.h (LIBGCC_SPEC): Add support for -nolibgcc. * gcc/config/sol2-c.c (cmn_err_flag_specs): Add "#" diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c index e33dd567075..784d20b2c7a 100644 --- a/gcc/config/sol2-c.c +++ b/gcc/config/sol2-c.c @@ -43,7 +43,6 @@ static const format_length_info cmn_err_length_specs[] = static const format_flag_spec cmn_err_flag_specs[] = { - { '#', 0, 0, N_("`#' flag"), N_("the `#' cmn_err flag"), STD_C89 }, { 'w', 0, 0, N_("field width"), N_("field width in printf format"), STD_C89 }, { 'L', 0, 0, N_("length modifier"), N_("length modifier in printf format"), STD_C89 }, { 0, 0, 0, NULL, NULL, 0 } @@ -62,7 +61,7 @@ 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 }, + { "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 }, @@ -72,7 +71,7 @@ static const format_char_info cmn_err_char_table[] = }; 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, "", NULL, cmn_err_flag_specs, cmn_err_flag_pairs, FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK, 'w', 0, 0, 0, 'L', diff --git a/gcc/testsuite/gcc.dg/format/cmn-err-1.c b/gcc/testsuite/gcc.dg/format/cmn-err-1.c index 40954302273..36a53587d99 100644 --- a/gcc/testsuite/gcc.dg/format/cmn-err-1.c +++ b/gcc/testsuite/gcc.dg/format/cmn-err-1.c @@ -17,7 +17,6 @@ int main() int i = 1; long l = 2; llong ll = 3; - float f = 4.0; cmn_err_func (0, "%s", string); cmn_err_func (0, "%d %D %o %O %x %X %u", i, i, i, i, i, i, i); @@ -26,7 +25,6 @@ int main() ll, ll, ll, ll, ll, ll, ll); cmn_err_func (0, "%b %s", i, "\01Foo", string); cmn_err_func (0, "%p", string); - cmn_err_func (0, "%#x", i); cmn_err_func (0, "%i", i); /* { dg-error "unknown|too many" } */ cmn_err_func (0, "%d", l); /* { dg-error "int format, (long int|different type) arg" } */ @@ -35,6 +33,5 @@ int main() cmn_err_func (0, "%b", i, i); /* { dg-error "is not a pointer" } */ cmn_err_func (0, "%b", string, i); /* { dg-error "int format, pointer arg|is not a pointer" } */ cmn_err_func (0, "%p", 3); /* { dg-error "is not a pointer" } */ - cmn_err_func (0, "%#x", f); /* { dg-error "double arg" } */ return 0; } |