From: "H.J. Lu" <hjl.tools@gmail.com>
To: binutils@sourceware.org
Cc: nickc@redhat.com
Subject: [PATCH] ld: Improve --fatal-warnings for unknown command-line options
Date: Wed, 24 Jan 2024 14:51:03 -0800 [thread overview]
Message-ID: <20240124225103.219222-1-hjl.tools@gmail.com> (raw)
There are 2 problems with --fatal-warnings for ignored command-line
options:
1. --fatal-warnings doesn't trigger an error for an unknown command-line
option when --fatal-warnings is the last command-line option.
2. When --fatal-warnings triggers an error for an unknown command-line
option, the message says that the unknown command-line option is ignored.
This patch queues unknown command-line option warnings and outputs queued
command-line option warnings after all command-line options have been
processed so that --fatal-warnings can work for unknown command-line
options regardless of the order of --fatal-warnings.
When --fatal-warnings is used, the linker message is changed from
ld: warning: -z bad-option ignored
to
ld: error: unsupported option: -z bad-option
The above also applies to "-z dynamic-undefined-weak" when the known
"-z dynamic-undefined-weak" option is ignored.
PR ld/31289
* ldelf.c (ldelf_after_parse): Use queue_unknown_cmdline_warning
to warn the ignored -z dynamic-undefined-weak option.
* ldmain.c (main): Call output_unknown_cmdline_warnings after
calling ldemul_after_parse.
* ldmisc.c (CMDLINE_WARNING_SIZE): New.
(cmdline_warning_list): Likewise.
(cmdline_warning_head): Likewise.
(cmdline_warning_tail): Likewise.
(queue_unknown_cmdline_warning): Likewise.
(output_unknown_cmdline_warnings): Likewise.
* ldmisc.h (queue_unknown_cmdline_warning): Likewise.
(output_unknown_cmdline_warnings): Likewise.
* emultempl/elf.em (gld${EMULATION_NAME}_handle_option): Use
queue_unknown_cmdline_warning to warn unknown -z option.
* testsuite/ld-elf/pr31289-1a.d: New file.
* testsuite/ld-elf/pr31289-1b.d: Likewise.
* testsuite/ld-elf/pr31289-2a.d: Likewise.
* testsuite/ld-elf/pr31289-2b.d: Likewise.
* testsuite/ld-elf/pr31289-3a.d: Likewise.
* testsuite/ld-elf/pr31289-3b.d: Likewise.
* testsuite/ld-elf/pr31289-4a.d: Likewise.
* testsuite/ld-elf/pr31289-4b.d: Likewise.
---
ld/emultempl/elf.em | 2 +-
ld/ldelf.c | 2 +-
ld/ldmain.c | 2 +
ld/ldmisc.c | 75 ++++++++++++++++++++++++++++++++
ld/ldmisc.h | 2 +
ld/testsuite/ld-elf/pr31289-1a.d | 5 +++
ld/testsuite/ld-elf/pr31289-1b.d | 5 +++
ld/testsuite/ld-elf/pr31289-2a.d | 5 +++
ld/testsuite/ld-elf/pr31289-2b.d | 5 +++
ld/testsuite/ld-elf/pr31289-3a.d | 5 +++
ld/testsuite/ld-elf/pr31289-3b.d | 5 +++
ld/testsuite/ld-elf/pr31289-4a.d | 5 +++
ld/testsuite/ld-elf/pr31289-4b.d | 5 +++
13 files changed, 121 insertions(+), 2 deletions(-)
create mode 100644 ld/testsuite/ld-elf/pr31289-1a.d
create mode 100644 ld/testsuite/ld-elf/pr31289-1b.d
create mode 100644 ld/testsuite/ld-elf/pr31289-2a.d
create mode 100644 ld/testsuite/ld-elf/pr31289-2b.d
create mode 100644 ld/testsuite/ld-elf/pr31289-3a.d
create mode 100644 ld/testsuite/ld-elf/pr31289-3b.d
create mode 100644 ld/testsuite/ld-elf/pr31289-4a.d
create mode 100644 ld/testsuite/ld-elf/pr31289-4b.d
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
index f551225cdac..55a870f7d2d 100644
--- a/ld/emultempl/elf.em
+++ b/ld/emultempl/elf.em
@@ -873,7 +873,7 @@ fi
fragment <<EOF
else
- einfo (_("%P: warning: -z %s ignored\n"), optarg);
+ queue_unknown_cmdline_warning ("-z %s", optarg);
break;
EOF
diff --git a/ld/ldelf.c b/ld/ldelf.c
index 2852851dcd5..04045acbf3d 100644
--- a/ld/ldelf.c
+++ b/ld/ldelf.c
@@ -74,7 +74,7 @@ ldelf_after_parse (void)
&& link_info.nointerp)
{
if (link_info.dynamic_undefined_weak > 0)
- einfo (_("%P: warning: -z dynamic-undefined-weak ignored\n"));
+ queue_unknown_cmdline_warning ("-z dynamic-undefined-weak");
link_info.dynamic_undefined_weak = 0;
}
diff --git a/ld/ldmain.c b/ld/ldmain.c
index e90c2021b33..3b4ad144a2f 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -479,6 +479,8 @@ main (int argc, char **argv)
ldemul_after_parse ();
+ output_unknown_cmdline_warnings ();
+
if (config.map_filename)
{
if (strcmp (config.map_filename, "-") == 0)
diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index 3c862ea437a..180b24b3448 100644
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -620,6 +620,81 @@ einfo (const char *fmt, ...)
fflush (stderr);
}
+/* The buffer size for each command-line option warning. */
+#define CMDLINE_WARNING_SIZE 256
+
+/* A linked list of command-line option warnings. */
+
+struct cmdline_warning_list
+{
+ struct cmdline_warning_list *next;
+ char *warning;
+};
+
+/* The head of the linked list of command-line option warnings. */
+static struct cmdline_warning_list *cmdline_warning_head = NULL;
+
+/* The tail of the linked list of command-line option warnings. */
+static struct cmdline_warning_list **cmdline_warning_tail
+ = &cmdline_warning_head;
+
+/* Queue an unknown command-line option warning. */
+
+void
+queue_unknown_cmdline_warning (const char *fmt, ...)
+{
+ va_list arg;
+ struct cmdline_warning_list *warning_ptr
+ = xmalloc (sizeof (*warning_ptr));
+ warning_ptr->warning = xmalloc (CMDLINE_WARNING_SIZE);
+ warning_ptr->next = NULL;
+ int written;
+
+ va_start (arg, fmt);
+ written = vsnprintf (warning_ptr->warning, CMDLINE_WARNING_SIZE, fmt,
+ arg);
+ if (written < 0 || written >= CMDLINE_WARNING_SIZE)
+ {
+ /* If vsnprintf fails or truncates, output the warning directly. */
+ fflush (stdout);
+ va_start (arg, fmt);
+ vfinfo (stderr, fmt, arg, true);
+ fflush (stderr);
+ }
+ else
+ {
+ *cmdline_warning_tail = warning_ptr;
+ cmdline_warning_tail = &warning_ptr->next;
+ }
+ va_end (arg);
+}
+
+/* Output queued unknown command-line option warnings. */
+
+void
+output_unknown_cmdline_warnings (void)
+{
+ struct cmdline_warning_list *list = cmdline_warning_head;
+ struct cmdline_warning_list *next;
+ if (list == NULL)
+ return;
+
+ fflush (stdout);
+
+ for (; list != NULL; list = next)
+ {
+ next = list->next;
+ if (config.fatal_warnings)
+ einfo (_("%P: error: unsupported option: %s\n"), list->warning);
+ else
+ einfo (_("%P: warning: %s ignored\n"), list->warning);
+ free (list->warning);
+ free (list);
+ }
+
+ fflush (stderr);
+}
+
void
info_assert (const char *file, unsigned int line)
{
diff --git a/ld/ldmisc.h b/ld/ldmisc.h
index e8b982fe324..20289127c0a 100644
--- a/ld/ldmisc.h
+++ b/ld/ldmisc.h
@@ -27,6 +27,8 @@ extern void minfo (const char *, ...);
extern void info_msg (const char *, ...);
extern void lfinfo (FILE *, const char *, ...);
extern void info_assert (const char *, unsigned int);
+extern void queue_unknown_cmdline_warning (const char *, ...);
+extern void output_unknown_cmdline_warnings (void);
#define ASSERT(x) \
do { if (!(x)) info_assert(__FILE__,__LINE__); } while (0)
diff --git a/ld/testsuite/ld-elf/pr31289-1a.d b/ld/testsuite/ld-elf/pr31289-1a.d
new file mode 100644
index 00000000000..aafbb5feb9a
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-1a.d
@@ -0,0 +1,5 @@
+#source: pr22269.s
+#ld: -pie --no-dynamic-linker --fatal-warnings -z dynamic-undefined-weak
+#readelf: -r -x .data.rel.ro
+#error: unsupported option: -z dynamic-undefined-weak
+#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
diff --git a/ld/testsuite/ld-elf/pr31289-1b.d b/ld/testsuite/ld-elf/pr31289-1b.d
new file mode 100644
index 00000000000..321eac7f2c8
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-1b.d
@@ -0,0 +1,5 @@
+#source: pr22269.s
+#ld: -pie --no-dynamic-linker -z dynamic-undefined-weak --fatal-warnings
+#readelf: -r -x .data.rel.ro
+#error: unsupported option: -z dynamic-undefined-weak
+#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
diff --git a/ld/testsuite/ld-elf/pr31289-2a.d b/ld/testsuite/ld-elf/pr31289-2a.d
new file mode 100644
index 00000000000..3c8b0fa7e0a
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-2a.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: -z bad-option1 -z bad-option2
+#warning: -z bad-option1 ignored
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/pr31289-2b.d b/ld/testsuite/ld-elf/pr31289-2b.d
new file mode 100644
index 00000000000..051dd0b5159
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-2b.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: -z bad-option1 -z bad-option2
+#warning: -z bad-option2 ignored
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/pr31289-3a.d b/ld/testsuite/ld-elf/pr31289-3a.d
new file mode 100644
index 00000000000..70ad22b8413
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-3a.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: --fatal-warnings -z bad-option1 -z bad-option2
+#error: unsupported option: -z bad-option1
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/pr31289-3b.d b/ld/testsuite/ld-elf/pr31289-3b.d
new file mode 100644
index 00000000000..49ed344bfa8
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-3b.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: --fatal-warnings -z bad-option1 -z bad-option2
+#error: unsupported option: -z bad-option2
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/pr31289-4a.d b/ld/testsuite/ld-elf/pr31289-4a.d
new file mode 100644
index 00000000000..dd19eed9428
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-4a.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: -z bad-option1 -z bad-option2 --fatal-warnings
+#error: unsupported option: -z bad-option1
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
diff --git a/ld/testsuite/ld-elf/pr31289-4b.d b/ld/testsuite/ld-elf/pr31289-4b.d
new file mode 100644
index 00000000000..e5708240cc6
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr31289-4b.d
@@ -0,0 +1,5 @@
+#source: start.s
+#ld: -z bad-option1 -z bad-option2 --fatal-warnings
+#error: unsupported option: -z bad-option2
+#xfail: [is_generic]
+# generic linker targets don't support -z options.
--
2.43.0
next reply other threads:[~2024-01-24 22:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 22:51 H.J. Lu [this message]
2024-01-25 7:58 ` Fangrui Song
2024-01-25 8:24 ` Jan Beulich
2024-01-25 11:32 ` Nick Clifton
2024-01-25 13:41 ` H.J. Lu
2024-01-25 15:45 ` H.J. Lu
2024-01-25 16:12 ` H.J. Lu
2024-01-26 10:24 ` Nick Clifton
2024-01-26 14:11 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240124225103.219222-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=binutils@sourceware.org \
--cc=nickc@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).