From 4bf05d4a900ae2c6c59e173340cc087584e46c81 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 24 Jun 2020 06:39:03 -0700 Subject: ld: Correct --dependency-file order Change ld --help output to -d, -dc, -dp Force common symbols to be defined --dependency-file FILE Write dependency file instead of -d, -dc Force common symbols to be defined --dependency-file FILE, -dp Write dependency file PR ld/26165 * lexsup.c (ld_options): Correct --dependency-file order. --- ld/ChangeLog | 5 +++++ ld/lexsup.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index bf171da..6f58650 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2020-06-24 H.J. Lu + PR ld/26165 + * lexsup.c (ld_options): Correct --dependency-file order. + +2020-06-24 H.J. Lu + PR ld/26083 * testsuite/ld-csky/tls-ie-v1.d: Updated. * testsuite/ld-csky/tls-ie.d: Likewise. diff --git a/ld/lexsup.c b/ld/lexsup.c index d6e9367..58c6c07 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -111,10 +111,10 @@ static const struct ld_option ld_options[] = 'c', N_("FILE"), N_("Read MRI format linker script"), TWO_DASHES }, { {"dc", no_argument, NULL, 'd'}, 'd', NULL, N_("Force common symbols to be defined"), ONE_DASH }, - { {"dependency-file", required_argument, NULL, OPTION_DEPENDENCY_FILE}, - '\0', N_("FILE"), N_("Write dependency file"), TWO_DASHES }, { {"dp", no_argument, NULL, 'd'}, '\0', NULL, NULL, ONE_DASH }, + { {"dependency-file", required_argument, NULL, OPTION_DEPENDENCY_FILE}, + '\0', N_("FILE"), N_("Write dependency file"), TWO_DASHES }, { {"force-group-allocation", no_argument, NULL, OPTION_FORCE_GROUP_ALLOCATION}, '\0', NULL, N_("Force group members out of groups"), TWO_DASHES }, -- cgit v1.1