/* Parse options for the GNU linker.
- Copyright (C) 1991-2017 Free Software Foundation, Inc.
+ Copyright (C) 1991-2018 Free Software Foundation, Inc.
This file is part of the GNU Binutils.
/* Fall through. */
default:
- einfo (_("%P%F: use the --help option for usage information\n"));
+ einfo (_("%F%P: use the --help option for usage information\n"));
break;
case 1: /* File name. */
|| strcmp (optarg, "default") == 0)
input_flags.dynamic = TRUE;
else
- einfo (_("%P%F: unrecognized -a option `%s'\n"), optarg);
+ einfo (_("%F%P: unrecognized -a option `%s'\n"), optarg);
break;
case OPTION_ASSERT:
/* FIXME: We just ignore these, but we should handle them. */
else if (strcmp (optarg, "pure-text") == 0)
;
else
- einfo (_("%P%F: unrecognized -assert option `%s'\n"), optarg);
+ einfo (_("%F%P: unrecognized -assert option `%s'\n"), optarg);
break;
case 'A':
ldfile_add_arch (optarg);
case 'd':
command_line.force_common_definition = TRUE;
break;
- case OPTION_FORCE_GROUP_ALLOCATION:
- command_line.force_group_allocation = TRUE;
- break;
+ case OPTION_FORCE_GROUP_ALLOCATION:
+ command_line.force_group_allocation = TRUE;
+ break;
case OPTION_DEFSYM:
lex_string = optarg;
lex_redirect (optarg, "--defsym", ++defsym_count);
if (command_line.auxiliary_filters == NULL)
{
command_line.auxiliary_filters = (char **)
- xmalloc (2 * sizeof (char *));
+ xmalloc (2 * sizeof (char *));
command_line.auxiliary_filters[0] = optarg;
command_line.auxiliary_filters[1] = NULL;
}
for (p = command_line.auxiliary_filters; *p != NULL; p++)
++c;
command_line.auxiliary_filters = (char **)
- xrealloc (command_line.auxiliary_filters,
- (c + 2) * sizeof (char *));
+ xrealloc (command_line.auxiliary_filters,
+ (c + 2) * sizeof (char *));
command_line.auxiliary_filters[c] = optarg;
command_line.auxiliary_filters[c + 1] = NULL;
}
char *end;
g_switch_value = strtoul (optarg, &end, 0);
if (*end)
- einfo (_("%P%F: invalid number `%s'\n"), optarg);
+ einfo (_("%F%P: invalid number `%s'\n"), optarg);
}
break;
case 'g':
link_info.unresolved_syms_in_shared_libs
= how_to_report_unresolved_symbols;
}
- else if (strcmp (optarg, "ignore-in-shared-libs") == 0)
+ else if (strcmp (optarg, "ignore-in-shared-libs") == 0)
{
link_info.unresolved_syms_in_objects
= how_to_report_unresolved_symbols;
link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
}
else
- einfo (_("%P%F: bad --unresolved-symbols option: %s\n"), optarg);
+ einfo (_("%F%P: bad --unresolved-symbols option: %s\n"), optarg);
break;
case OPTION_WARN_UNRESOLVED_SYMBOLS:
how_to_report_unresolved_symbols = RM_GENERATE_WARNING;
break;
case OPTION_PLUGIN_OPT:
if (plugin_opt_plugin_arg (optarg))
- einfo (_("%P%F: bad -plugin-opt option\n"));
+ einfo (_("%F%P: bad -plugin-opt option\n"));
break;
#endif /* ENABLE_PLUGINS */
case 'q':
an error message here. We cannot just make this a warning,
increment optind, and continue because getopt is too confused
and will seg-fault the next time around. */
- einfo(_("%P%F: unrecognised option: %s\n"), argv[optind]);
+ einfo(_("%F%P: unrecognised option: %s\n"), argv[optind]);
if (bfd_link_pic (&link_info))
- einfo (_("%P%F: -r and %s may not be used together\n"),
+ einfo (_("%F%P: -r and %s may not be used together\n"),
bfd_link_dll (&link_info) ? "-shared" : "-pie");
link_info.type = type_relocatable;
char *buf;
buf = (char *) xmalloc (strlen (command_line.rpath_link)
- + strlen (optarg)
- + 2);
+ + strlen (optarg)
+ + 2);
sprintf (buf, "%s%c%s", command_line.rpath_link,
config.rpath_separator, optarg);
free (command_line.rpath_link);
if (config.has_shared)
{
if (bfd_link_relocatable (&link_info))
- einfo (_("%P%F: -r and -shared may not be used together\n"));
+ einfo (_("%F%P: -r and %s may not be used together\n"),
+ "-shared");
link_info.type = type_dll;
/* When creating a shared library, the default
link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
}
else
- einfo (_("%P%F: -shared not supported\n"));
+ einfo (_("%F%P: -shared not supported\n"));
break;
case OPTION_PIE:
if (config.has_shared)
{
if (bfd_link_relocatable (&link_info))
- einfo (_("%P%F: -r and -pie may not be used together\n"));
+ einfo (_("%F%P: -r and %s may not be used together\n"), "-pie");
link_info.type = type_pie;
}
else
- einfo (_("%P%F: -pie not supported\n"));
+ einfo (_("%F%P: -pie not supported\n"));
break;
case 'h': /* Used on Solaris. */
case OPTION_SONAME:
case OPTION_SORT_COMMON:
if (optarg == NULL
|| strcmp (optarg, N_("descending")) == 0)
- config.sort_common = sort_descending;
- else if (strcmp (optarg, N_("ascending")) == 0)
+ config.sort_common = sort_descending;
+ else if (strcmp (optarg, N_("ascending")) == 0)
config.sort_common = sort_ascending;
else
- einfo (_("%P%F: invalid common section sorting option: %s\n"),
+ einfo (_("%F%P: invalid common section sorting option: %s\n"),
optarg);
break;
case OPTION_SORT_SECTION:
else if (strcmp (optarg, N_("alignment")) == 0)
sort_section = by_alignment;
else
- einfo (_("%P%F: invalid section sorting option: %s\n"),
+ einfo (_("%F%P: invalid section sorting option: %s\n"),
optarg);
break;
case OPTION_STATS:
/* Check for <something>=<somthing>... */
optarg2 = strchr (optarg, '=');
if (optarg2 == NULL)
- einfo (_("%P%F: invalid argument to option"
+ einfo (_("%F%P: invalid argument to option"
" \"--section-start\"\n"));
optarg2++;
/* So far so good. Are all the args present? */
if ((*optarg == '\0') || (*optarg2 == '\0'))
- einfo (_("%P%F: missing argument(s) to option"
+ einfo (_("%F%P: missing argument(s) to option"
" \"--section-start\"\n"));
/* We must copy the section name as set_section_start
/* Fall through. */
case OPTION_UR:
if (bfd_link_pic (&link_info))
- einfo (_("%P%F: -r and %s may not be used together\n"),
+ einfo (_("%F%P: -r and %s may not be used together\n"),
bfd_link_dll (&link_info) ? "-shared" : "-pie");
link_info.type = type_relocatable;
case 'u':
ldlang_add_undef (optarg, TRUE);
break;
- case OPTION_REQUIRE_DEFINED_SYMBOL:
- ldlang_add_require_defined (optarg);
+ case OPTION_REQUIRE_DEFINED_SYMBOL:
+ ldlang_add_require_defined (optarg);
break;
case OPTION_UNIQUE:
if (optarg != NULL)
char *end;
int level ATTRIBUTE_UNUSED = strtoul (optarg, &end, 0);
if (*end)
- einfo (_("%P%F: invalid number `%s'\n"), optarg);
+ einfo (_("%F%P: invalid number `%s'\n"), optarg);
#ifdef ENABLE_PLUGINS
report_plugin_symbols = level > 1;
#endif /* ENABLE_PLUGINS */
break;
case ')':
if (! ingroup)
- einfo (_("%P%F: group ended before it began (--help for usage)\n"));
+ einfo (_("%F%P: group ended before it began (--help for usage)\n"));
lang_leave_group ();
ingroup--;
config.hash_table_size = 1021;
break;
- case OPTION_HASH_SIZE:
+ case OPTION_HASH_SIZE:
{
bfd_size_type new_size;
- new_size = strtoul (optarg, NULL, 0);
- if (new_size)
- config.hash_table_size = new_size;
- else
- einfo (_("%P%X: --hash-size needs a numeric argument\n"));
- }
- break;
+ new_size = strtoul (optarg, NULL, 0);
+ if (new_size)
+ config.hash_table_size = new_size;
+ else
+ einfo (_("%X%P: --hash-size needs a numeric argument\n"));
+ }
+ break;
case OPTION_PUSH_STATE:
input_flags.pushed = xmemdup (&input_flags,
case OPTION_POP_STATE:
if (input_flags.pushed == NULL)
- einfo (_("%P%F: no state pushed before popping\n"));
+ einfo (_("%F%P: no state pushed before popping\n"));
else
{
struct lang_input_statement_flags *oldp = input_flags.pushed;
else if (strcasecmp (optarg, "discard") == 0)
config.orphan_handling = orphan_handling_discard;
else
- einfo (_("%P%F: invalid argument to option"
+ einfo (_("%F%P: invalid argument to option"
" \"--orphan-handling\"\n"));
break;
}
if (!bfd_link_dll (&link_info))
{
if (command_line.filter_shlib)
- einfo (_("%P%F: -F may not be used without -shared\n"));
+ einfo (_("%F%P: -F may not be used without -shared\n"));
if (command_line.auxiliary_filters)
- einfo (_("%P%F: -f may not be used without -shared\n"));
+ einfo (_("%F%P: -f may not be used without -shared\n"));
}
/* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I
const char *end;
bfd_vma val = bfd_scan_vma (valstr, &end, 16);
if (*end)
- einfo (_("%P%F: invalid hex number `%s'\n"), valstr);
+ einfo (_("%F%P: invalid hex number `%s'\n"), valstr);
lang_section_start (sect, exp_intop (val), NULL);
}
bfd_vma val = bfd_scan_vma (valstr, &end, 16);
if (*end)
- einfo (_("%P%F: invalid hex number `%s'\n"), valstr);
+ einfo (_("%F%P: invalid hex number `%s'\n"), valstr);
/* If we already have an entry for this segment, update the existing
value. */
name = section + 1;
--hash-style=STYLE Set hash style to sysv, gnu or both\n"));
fprintf (file, _("\
-P AUDITLIB, --depaudit=AUDITLIB\n" "\
- Specify a library to use for auditing dependencies\n"));
+ Specify a library to use for auditing dependencies\n"));
fprintf (file, _("\
-z combreloc Merge dynamic relocs into one section and sort\n"));
fprintf (file, _("\
-z nocombreloc Don't merge dynamic relocs into one section\n"));
fprintf (file, _("\
-z global Make symbols in DSO available for subsequently\n\
- loaded objects\n"));
+ loaded objects\n"));
fprintf (file, _("\
-z initfirst Mark DSO to be initialized first at runtime\n"));
fprintf (file, _("\
-z now Mark object non-lazy runtime binding\n"));
fprintf (file, _("\
-z origin Mark object requiring immediate $ORIGIN\n\
- processing at runtime\n"));
+ processing at runtime\n"));
#if DEFAULT_LD_Z_RELRO
fprintf (file, _("\
-z relro Create RELRO program header (default)\n"));
fprintf (file, _("\
-z norelro Don't create RELRO program header (default)\n"));
#endif
+ fprintf (file, _("\
+ -z separate-code Create separate code program header\n"));
+ fprintf (file, _("\
+ -z noseparate-code Don't create separate code program header (default)\n"));
fprintf (file, _("\
-z common Generate common symbols with STT_COMMON type\n"));
fprintf (file, _("\
fprintf (file, _("\
-z max-page-size=SIZE Set maximum page size to SIZE\n"));
fprintf (file, _("\
- -z defs Report unresolved symbols in object files.\n"));
+ -z defs Report unresolved symbols in object files\n"));
fprintf (file, _("\
-z muldefs Allow multiple definitions\n"));
fprintf (file, _("\
-z execstack Mark executable as requiring executable stack\n"));
fprintf (file, _("\
-z noexecstack Mark executable as not requiring executable stack\n"));
+ fprintf (file, _("\
+ -z globalaudit Mark executable requiring global auditing\n"));
}
static void
elf_plt_unwind_list_options (FILE *file)
{
fprintf (file, _("\
- --ld-generated-unwind-info Generate exception handling info for PLT\n\
+ --ld-generated-unwind-info Generate exception handling info for PLT\n"));
+ fprintf (file, _("\
--no-ld-generated-unwind-info\n\
Don't generate exception handling info for PLT\n"));
}