From 45e813544eb076dd52fefe7b36e28b088963207d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 11 Feb 2015 12:16:07 -0800 Subject: [PATCH] Output "warning:" or "error:" in plugin messages When plugin generates LDPL_WARNING, LDPL_FATAL and LDPL_ERROR messages, linker should display "warning:" or "error:" in plugin messages like regular linker messages. ld/ * plugin.c (message): Output "warning:" for LDPL_WARNING. Output "error:" for LDPL_FATAL and LDPL_ERROR. * testplug2.c (parse_option): Handle fatal, error and warning. ld/testsuite/ * ld-plugin/plugin-27.d: New. * ld-plugin/plugin-28.d: Likewise. * ld-plugin/plugin-29.d: Likewise. * plugin.exp (plugin_tests): Add tests for LDPL_FATAL, LDPL_ERROR and LDPL_WARNING. --- ld/ChangeLog | 6 ++++++ ld/plugin.c | 12 ++++++++---- ld/testplug2.c | 17 ++++++++++++++++- ld/testsuite/ChangeLog | 8 ++++++++ ld/testsuite/ld-plugin/plugin-27.d | 1 + ld/testsuite/ld-plugin/plugin-28.d | 1 + ld/testsuite/ld-plugin/plugin-29.d | 1 + ld/testsuite/ld-plugin/plugin.exp | 6 ++++++ 8 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 ld/testsuite/ld-plugin/plugin-27.d create mode 100644 ld/testsuite/ld-plugin/plugin-28.d create mode 100644 ld/testsuite/ld-plugin/plugin-29.d diff --git a/ld/ChangeLog b/ld/ChangeLog index 7bd1c01ce8..f46bd9b017 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2015-02-11 H.J. Lu + + * plugin.c (message): Output "warning:" for LDPL_WARNING. Output + "error:" for LDPL_FATAL and LDPL_ERROR. + * testplug2.c (parse_option): Handle fatal, error and warning. + 2015-02-11 H.J. Lu * testplug2.c (dump_tv_tag): Removed. diff --git a/ld/plugin.c b/ld/plugin.c index b48ce86a6f..4fee305b69 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -814,15 +814,19 @@ message (int level, const char *format, ...) putchar ('\n'); break; case LDPL_WARNING: - vfinfo (stdout, format, args, TRUE); - putchar ('\n'); + { + char *newfmt = ACONCAT (("%P: warning: ", format, "\n", + (const char *) NULL)); + vfinfo (stdout, newfmt, args, TRUE); + } break; case LDPL_FATAL: case LDPL_ERROR: default: { - char *newfmt = ACONCAT ((level == LDPL_FATAL ? "%P%F: " : "%P%X: ", - format, "\n", (const char *) NULL)); + char *newfmt = ACONCAT ((level == LDPL_FATAL ? "%P%F" : "%P%X", + ": error: ", format, "\n", + (const char *) NULL)); fflush (stdout); vfinfo (stderr, newfmt, args, TRUE); fflush (stderr); diff --git a/ld/testplug2.c b/ld/testplug2.c index 8cafc51606..10f0efba6c 100644 --- a/ld/testplug2.c +++ b/ld/testplug2.c @@ -318,7 +318,22 @@ set_register_hook (const char *whichhook, bfd_boolean yesno) static enum ld_plugin_status parse_option (const char *opt) { - if (!strncmp ("fail", opt, 4)) + if (!strncmp ("fatal", opt, 5)) + { + TV_MESSAGE (LDPL_FATAL, "Fatal error"); + fflush (NULL); + } + else if (!strncmp ("error", opt, 5)) + { + TV_MESSAGE (LDPL_ERROR, "Error"); + fflush (NULL); + } + else if (!strncmp ("warning", opt, 7)) + { + TV_MESSAGE (LDPL_WARNING, "Warning"); + fflush (NULL); + } + else if (!strncmp ("fail", opt, 4)) return set_ret_val (opt + 4, LDPS_ERR); else if (!strncmp ("pass", opt, 4)) return set_ret_val (opt + 4, LDPS_OK); diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index ea1d533672..2b963fa391 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2015-02-11 H.J. Lu + + * ld-plugin/plugin-27.d: New. + * ld-plugin/plugin-28.d: Likewise. + * ld-plugin/plugin-29.d: Likewise. + * plugin.exp (plugin_tests): Add tests for LDPL_FATAL, LDPL_ERROR + and LDPL_WARNING. + 2015-02-11 H.J. Lu PR ld/17878 diff --git a/ld/testsuite/ld-plugin/plugin-27.d b/ld/testsuite/ld-plugin/plugin-27.d new file mode 100644 index 0000000000..bae8c2c611 --- /dev/null +++ b/ld/testsuite/ld-plugin/plugin-27.d @@ -0,0 +1 @@ +.*: error: Fatal error diff --git a/ld/testsuite/ld-plugin/plugin-28.d b/ld/testsuite/ld-plugin/plugin-28.d new file mode 100644 index 0000000000..9052b7654e --- /dev/null +++ b/ld/testsuite/ld-plugin/plugin-28.d @@ -0,0 +1 @@ +.*: error: Error diff --git a/ld/testsuite/ld-plugin/plugin-29.d b/ld/testsuite/ld-plugin/plugin-29.d new file mode 100644 index 0000000000..c42bdf2024 --- /dev/null +++ b/ld/testsuite/ld-plugin/plugin-29.d @@ -0,0 +1 @@ +.*: warning: Warning diff --git a/ld/testsuite/ld-plugin/plugin.exp b/ld/testsuite/ld-plugin/plugin.exp index b83253440d..35b7bbe529 100644 --- a/ld/testsuite/ld-plugin/plugin.exp +++ b/ld/testsuite/ld-plugin/plugin.exp @@ -168,6 +168,12 @@ set plugin_tests [list \ $testsrcfiles $libs" "" "" "" {{ld plugin-17.d}} "main.x" ] \ [list "load plugin with source not claimed" "-plugin $plugin_path $regclm \ $testsrcfiles $libs" "" "" "" {{ld plugin-26.d}} "main.x" ] \ + [list "plugin fatal error" "-plugin $plugin2_path -plugin-opt fatal \ + $testobjfiles $libs" "" "" "" {{ld plugin-27.d}} "main.x" ] \ + [list "plugin error" "-plugin $plugin2_path -plugin-opt error \ + $testobjfiles $libs" "" "" "" {{ld plugin-28.d}} "main.x" ] \ + [list "plugin warning" "-plugin $plugin2_path -plugin-opt warning \ + $testobjfiles $libs" "" "" "" {{ld plugin-29.d}} "main.x" ] \ ] set plugin_lib_tests [list \ -- 2.34.1