# This shell script emits a C file. -*- C -*-
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# MA 02110-1301, USA.
#
-# This file is sourced from elf32.em, and defines extra powerpc64-elf
+# This file is sourced from elf.em, and defines extra powerpc64-elf
# specific routines.
#
fragment <<EOF
#include "ldctor.h"
-#include "libbfd.h"
#include "elf-bfd.h"
#include "elf64-ppc.h"
#include "ldlex.h"
static struct ppc64_elf_params params = { NULL,
&ppc_add_stub_section,
&ppc_layout_sections_again,
- 1, 0, 0,
- ${DEFAULT_PLT_STATIC_CHAIN-0}, -1, 0,
- 0, -1, -1, 0};
+ 1, -1, 0,
+ ${DEFAULT_PLT_STATIC_CHAIN-0}, -1, 5,
+ -1, 0, -1, -1, 0};
/* Fake input file for stubs. */
static lang_input_statement_type *stub_file;
/* Whether to run opd optimization. */
static int no_opd_opt = 0;
+/* Whether to convert inline PLT calls to direct. */
+static int no_inline_opt = 0;
+
/* Whether to run toc optimization. */
static int no_toc_opt = 0;
bfd_get_arch (link_info.output_bfd),
bfd_get_mach (link_info.output_bfd)))
{
- einfo ("%F%P: can not create BFD: %E\n");
+ einfo (_("%F%P: can not create BFD: %E\n"));
return;
}
if (params.save_restore_funcs < 0)
params.save_restore_funcs = !bfd_link_relocatable (&link_info);
if (!ppc64_elf_init_stub_bfd (&link_info, ¶ms))
- einfo ("%F%P: can not init BFD: %E\n");
+ einfo (_("%F%P: can not init BFD: %E\n"));
}
/* Called after opening files but before mapping sections. */
if (expld.phase != lang_mark_phase_enum)
{
expld.phase = lang_mark_phase_enum;
- expld.dataseg.phase = exp_dataseg_none;
+ expld.dataseg.phase = exp_seg_none;
one_lang_size_sections_pass (NULL, FALSE);
/* We must not cache anything from the preliminary sizing. */
lang_reset_memory_regions ();
{
if (!no_opd_opt
&& !ppc64_elf_edit_opd (&link_info))
- einfo ("%X%P: can not edit %s: %E\n", "opd");
+ einfo (_("%X%P: can not edit %s: %E\n"), "opd");
+
+ if (!no_inline_opt
+ && !bfd_link_relocatable (&link_info))
+ {
+ prelim_size_sections ();
+
+ if (!ppc64_elf_inline_plt (&link_info))
+ einfo (_("%X%P: inline PLT: %E\n"));
+ }
if (ppc64_elf_tls_setup (&link_info)
&& !no_tls_opt)
prelim_size_sections ();
if (!ppc64_elf_tls_optimize (&link_info))
- einfo ("%X%P: TLS problem %E\n");
+ einfo (_("%X%P: TLS problem %E\n"));
}
if (!no_toc_opt
prelim_size_sections ();
if (!ppc64_elf_edit_toc (&link_info))
- einfo ("%X%P: can not edit %s: %E\n", "toc");
+ einfo (_("%X%P: can not edit %s: %E\n"), "toc");
}
if (!no_toc_sort)
stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd,
stub_sec_name, flags);
if (stub_sec == NULL
- || !bfd_set_section_alignment (stub_file->the_bfd, stub_sec,
- (params.plt_stub_align > 5
- ? params.plt_stub_align
- : 5)))
+ || !bfd_set_section_alignment (stub_sec, (params.plt_stub_align > 5
+ ? params.plt_stub_align
+ : params.plt_stub_align < -5
+ ? -params.plt_stub_align
+ : 5)))
goto err_ret;
output_section = input_section->output_section;
return stub_sec;
err_ret:
- einfo ("%X%P: can not make stub section: %E\n");
+ einfo (_("%X%P: can not make stub section: %E\n"));
return NULL;
}
/* If we have changed sizes of the stub sections, then we need
to recalculate all the section offsets. This may mean we need to
add even more stubs. */
- gld${EMULATION_NAME}_map_segments (TRUE);
+ ldelf_map_segments (TRUE);
if (!bfd_link_relocatable (&link_info))
ppc64_elf_set_toc (&link_info, link_info.output_bfd);
&& i->output_section == toc_section)
{
if (!ppc64_elf_next_toc_section (&link_info, i))
- einfo ("%X%P: linker script separates .got and .toc\n");
+ einfo (_("%X%P: linker script separates .got and .toc\n"));
}
}
}
{
asection *i = statement->input_section.section;
- if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms
+ if (!bfd_input_just_syms (i->owner)
&& (i->flags & SEC_EXCLUDE) == 0
&& i->output_section != NULL
&& i->output_section->owner == link_info.output_bfd)
{
if (!ppc64_elf_next_input_section (&link_info, i))
- einfo ("%X%P: can not size stub section: %E\n");
+ einfo (_("%X%P: can not size stub section: %E\n"));
}
}
}
{
ret = ppc64_elf_setup_section_lists (&link_info);
if (ret < 0)
- einfo ("%X%P: can not size stub section: %E\n");
+ einfo (_("%X%P: can not size stub section: %E\n"));
else
{
ppc64_elf_start_multitoc_partition (&link_info);
lang_for_each_statement (build_section_lists);
if (!ppc64_elf_check_init_fini (&link_info))
- einfo ("%P: .init/.fini fragments use differing TOC pointers\n");
+ einfo (_("%P: .init/.fini fragments use differing TOC pointers\n"));
/* Call into the BFD backend to do the real work. */
if (!ppc64_elf_size_stubs (&link_info))
- einfo ("%X%P: can not size stub section: %E\n");
+ einfo (_("%X%P: can not size stub section: %E\n"));
}
}
ret = bfd_elf_discard_info (link_info.output_bfd, &link_info);
if (ret < 0)
{
- einfo ("%X%P: .eh_frame/.stab edit: %E\n");
+ einfo (_("%X%P: .eh_frame/.stab edit: %E\n"));
return;
}
else if (ret > 0)
unneeded, after ppc_layout_sections_again. Another call removes
these sections from the segment map. Their presence is
innocuous except for confusing ELF_SECTION_IN_SEGMENT. */
- gld${EMULATION_NAME}_map_segments (need_laying_out > 0);
+ ldelf_map_segments (need_laying_out > 0);
if (need_laying_out != -1 && !bfd_link_relocatable (&link_info))
ppc64_elf_set_toc (&link_info, link_info.output_bfd);
if (stub_file != NULL
&& !bfd_link_relocatable (&link_info)
&& !ppc64_elf_build_stubs (&link_info, config.stats ? &msg : NULL))
- einfo ("%X%P: can not build stubs: %E\n");
+ einfo (_("%X%P: can not build stubs: %E\n"));
fflush (stdout);
for (line = msg; line != NULL; line = endline)
if (msg != NULL)
free (msg);
- ppc64_elf_restore_symbols (&link_info);
finish_default ();
}
return dot_entry;
}
-
-/* Avoid processing the fake stub_file in vercheck, stat_needed and
- check_needed routines. */
-
-static void (*real_func) (lang_input_statement_type *);
-
-static void ppc_for_each_input_file_wrapper (lang_input_statement_type *l)
-{
- if (l != stub_file)
- (*real_func) (l);
-}
-
-static void
-ppc_lang_for_each_input_file (void (*func) (lang_input_statement_type *))
-{
- real_func = func;
- lang_for_each_input_file (&ppc_for_each_input_file_wrapper);
-}
-
-#define lang_for_each_input_file ppc_lang_for_each_input_file
-
EOF
if grep -q 'ld_elf32_spu_emulation' ldemul-list.h; then
fragment <<EOF
/* Special handling for embedded SPU executables. */
extern bfd_boolean embedded_spu_file (lang_input_statement_type *, const char *);
-static bfd_boolean gld${EMULATION_NAME}_load_symbols (lang_input_statement_type *);
static bfd_boolean
ppc64_recognized_file (lang_input_statement_type *entry)
if (embedded_spu_file (entry, "-m64"))
return TRUE;
- return gld${EMULATION_NAME}_load_symbols (entry);
+ return ldelf_load_symbols (entry);
}
EOF
LDEMUL_RECOGNIZED_FILE=ppc64_recognized_file
# parse_args and list_options functions.
#
PARSE_AND_LIST_PROLOGUE=${PARSE_AND_LIST_PROLOGUE}'
-#define OPTION_STUBGROUP_SIZE 321
-#define OPTION_PLT_STATIC_CHAIN (OPTION_STUBGROUP_SIZE + 1)
-#define OPTION_NO_PLT_STATIC_CHAIN (OPTION_PLT_STATIC_CHAIN + 1)
-#define OPTION_PLT_THREAD_SAFE (OPTION_NO_PLT_STATIC_CHAIN + 1)
-#define OPTION_NO_PLT_THREAD_SAFE (OPTION_PLT_THREAD_SAFE + 1)
-#define OPTION_PLT_ALIGN (OPTION_NO_PLT_THREAD_SAFE + 1)
-#define OPTION_NO_PLT_ALIGN (OPTION_PLT_ALIGN + 1)
-#define OPTION_STUBSYMS (OPTION_NO_PLT_ALIGN + 1)
-#define OPTION_NO_STUBSYMS (OPTION_STUBSYMS + 1)
-#define OPTION_SAVRES (OPTION_NO_STUBSYMS + 1)
-#define OPTION_NO_SAVRES (OPTION_SAVRES + 1)
-#define OPTION_DOTSYMS (OPTION_NO_SAVRES + 1)
-#define OPTION_NO_DOTSYMS (OPTION_DOTSYMS + 1)
-#define OPTION_NO_TLS_OPT (OPTION_NO_DOTSYMS + 1)
-#define OPTION_NO_TLS_GET_ADDR_OPT (OPTION_NO_TLS_OPT + 1)
-#define OPTION_NO_OPD_OPT (OPTION_NO_TLS_GET_ADDR_OPT + 1)
-#define OPTION_NO_TOC_OPT (OPTION_NO_OPD_OPT + 1)
-#define OPTION_NO_MULTI_TOC (OPTION_NO_TOC_OPT + 1)
-#define OPTION_NO_TOC_SORT (OPTION_NO_MULTI_TOC + 1)
-#define OPTION_NON_OVERLAPPING_OPD (OPTION_NO_TOC_SORT + 1)
+enum ppc64_opt
+{
+ OPTION_STUBGROUP_SIZE = 321,
+ OPTION_PLT_STATIC_CHAIN,
+ OPTION_NO_PLT_STATIC_CHAIN,
+ OPTION_PLT_THREAD_SAFE,
+ OPTION_NO_PLT_THREAD_SAFE,
+ OPTION_PLT_ALIGN,
+ OPTION_NO_PLT_ALIGN,
+ OPTION_PLT_LOCALENTRY,
+ OPTION_NO_PLT_LOCALENTRY,
+ OPTION_STUBSYMS,
+ OPTION_NO_STUBSYMS,
+ OPTION_SAVRES,
+ OPTION_NO_SAVRES,
+ OPTION_DOTSYMS,
+ OPTION_NO_DOTSYMS,
+ OPTION_NO_TLS_OPT,
+ OPTION_TLS_GET_ADDR_OPT,
+ OPTION_NO_TLS_GET_ADDR_OPT,
+ OPTION_NO_OPD_OPT,
+ OPTION_NO_INLINE_OPT,
+ OPTION_NO_TOC_OPT,
+ OPTION_NO_MULTI_TOC,
+ OPTION_NO_TOC_SORT,
+ OPTION_NON_OVERLAPPING_OPD
+};
'
PARSE_AND_LIST_LONGOPTS=${PARSE_AND_LIST_LONGOPTS}'
{ "no-plt-thread-safe", no_argument, NULL, OPTION_NO_PLT_THREAD_SAFE },
{ "plt-align", optional_argument, NULL, OPTION_PLT_ALIGN },
{ "no-plt-align", no_argument, NULL, OPTION_NO_PLT_ALIGN },
+ { "plt-localentry", optional_argument, NULL, OPTION_PLT_LOCALENTRY },
+ { "no-plt-localentry", no_argument, NULL, OPTION_NO_PLT_LOCALENTRY },
{ "emit-stub-syms", no_argument, NULL, OPTION_STUBSYMS },
{ "no-emit-stub-syms", no_argument, NULL, OPTION_NO_STUBSYMS },
{ "dotsyms", no_argument, NULL, OPTION_DOTSYMS },
{ "save-restore-funcs", no_argument, NULL, OPTION_SAVRES },
{ "no-save-restore-funcs", no_argument, NULL, OPTION_NO_SAVRES },
{ "no-tls-optimize", no_argument, NULL, OPTION_NO_TLS_OPT },
+ { "tls-get-addr-optimize", no_argument, NULL, OPTION_TLS_GET_ADDR_OPT },
{ "no-tls-get-addr-optimize", no_argument, NULL, OPTION_NO_TLS_GET_ADDR_OPT },
{ "no-opd-optimize", no_argument, NULL, OPTION_NO_OPD_OPT },
+ { "no-inline-optimize", no_argument, NULL, OPTION_NO_INLINE_OPT },
{ "no-toc-optimize", no_argument, NULL, OPTION_NO_TOC_OPT },
{ "no-multi-toc", no_argument, NULL, OPTION_NO_MULTI_TOC },
{ "no-toc-sort", no_argument, NULL, OPTION_NO_TOC_SORT },
choose suitable defaults.\n"
));
fprintf (file, _("\
- --plt-static-chain PLT call stubs should load r11.${DEFAULT_PLT_STATIC_CHAIN- (default)}\n"
+ --plt-static-chain PLT call stubs should load r11'${DEFAULT_PLT_STATIC_CHAIN- (default)}'\n"
));
fprintf (file, _("\
- --no-plt-static-chain PLT call stubs should not load r11.${DEFAULT_PLT_STATIC_CHAIN+ (default)}\n"
+ --no-plt-static-chain PLT call stubs should not load r11'${DEFAULT_PLT_STATIC_CHAIN+ (default)}'\n"
));
fprintf (file, _("\
- --plt-thread-safe PLT call stubs with load-load barrier.\n"
+ --plt-thread-safe PLT call stubs with load-load barrier\n"
));
fprintf (file, _("\
- --no-plt-thread-safe PLT call stubs without barrier.\n"
+ --no-plt-thread-safe PLT call stubs without barrier\n"
));
fprintf (file, _("\
- --plt-align [=<align>] Align PLT call stubs to fit cache lines.\n"
+ --plt-align [=<align>] Align PLT call stubs to fit cache lines\n"
));
fprintf (file, _("\
- --no-plt-align Dont'\''t align individual PLT call stubs.\n"
+ --no-plt-align Dont'\''t align individual PLT call stubs\n"
));
fprintf (file, _("\
- --emit-stub-syms Label linker stubs with a symbol.\n"
+ --plt-localentry Optimize calls to ELFv2 localentry:0 functions\n"
));
fprintf (file, _("\
- --no-emit-stub-syms Don'\''t label linker stubs with a symbol.\n"
+ --no-plt-localentry Don'\''t optimize ELFv2 calls\n"
+ ));
+ fprintf (file, _("\
+ --emit-stub-syms Label linker stubs with a symbol\n"
+ ));
+ fprintf (file, _("\
+ --no-emit-stub-syms Don'\''t label linker stubs with a symbol\n"
));
fprintf (file, _("\
--dotsyms For every version pattern \"foo\" in a version\n\
descriptor symbols. Defaults to on.\n"
));
fprintf (file, _("\
- --no-dotsyms Don'\''t do anything special in version scripts.\n"
+ --no-dotsyms Don'\''t do anything special in version scripts\n"
));
fprintf (file, _("\
--save-restore-funcs Provide register save and restore routines used\n\
final link, off for ld -r.\n"
));
fprintf (file, _("\
- --no-save-restore-funcs Don'\''t provide these routines.\n"
+ --no-save-restore-funcs Don'\''t provide these routines\n"
+ ));
+ fprintf (file, _("\
+ --no-tls-optimize Don'\''t try to optimize TLS accesses\n"
+ ));
+ fprintf (file, _("\
+ --tls-get-addr-optimize Force use of special __tls_get_addr call\n"
));
fprintf (file, _("\
- --no-tls-optimize Don'\''t try to optimize TLS accesses.\n"
+ --no-tls-get-addr-optimize Don'\''t use a special __tls_get_addr call\n"
));
fprintf (file, _("\
- --no-tls-get-addr-optimize Don'\''t use a special __tls_get_addr call.\n"
+ --no-opd-optimize Don'\''t optimize the OPD section\n"
));
fprintf (file, _("\
- --no-opd-optimize Don'\''t optimize the OPD section.\n"
+ --no-inline-optimize Don'\''t convert inline PLT to direct calls\n"
));
fprintf (file, _("\
- --no-toc-optimize Don'\''t optimize the TOC section.\n"
+ --no-toc-optimize Don'\''t optimize the TOC section\n"
));
fprintf (file, _("\
- --no-multi-toc Disallow automatic multiple toc sections.\n"
+ --no-multi-toc Disallow automatic multiple toc sections\n"
));
fprintf (file, _("\
- --no-toc-sort Don'\''t sort TOC and GOT sections.\n"
+ --no-toc-sort Don'\''t sort TOC and GOT sections\n"
));
fprintf (file, _("\
--non-overlapping-opd Canonicalize .opd, so that there are no\n\
- overlapping .opd entries.\n"
+ overlapping .opd entries\n"
));
'
case OPTION_STUBGROUP_SIZE:
{
const char *end;
- params.group_size = bfd_scan_vma (optarg, &end, 0);
- if (*end)
- einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
+ params.group_size = bfd_scan_vma (optarg, &end, 0);
+ if (*end)
+ einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
}
break;
if (optarg != NULL)
{
char *end;
- unsigned long val = strtoul (optarg, &end, 0);
- if (*end || val > 8)
- einfo (_("%P%F: invalid --plt-align `%s'\''\n"), optarg);
+ long val = strtol (optarg, &end, 0);
+ if (*end || (unsigned long) val + 8 > 16)
+ einfo (_("%F%P: invalid --plt-align `%s'\''\n"), optarg);
params.plt_stub_align = val;
}
else
params.plt_stub_align = 0;
break;
+ case OPTION_PLT_LOCALENTRY:
+ params.plt_localentry0 = 1;
+ break;
+
+ case OPTION_NO_PLT_LOCALENTRY:
+ params.plt_localentry0 = 0;
+ break;
+
case OPTION_STUBSYMS:
params.emit_stub_syms = 1;
break;
no_tls_opt = 1;
break;
+ case OPTION_TLS_GET_ADDR_OPT:
+ params.tls_get_addr_opt = 1;
+ break;
+
case OPTION_NO_TLS_GET_ADDR_OPT:
- params.no_tls_get_addr_opt = 1;
+ params.tls_get_addr_opt = 0;
break;
case OPTION_NO_OPD_OPT:
no_opd_opt = 1;
break;
+ case OPTION_NO_INLINE_OPT:
+ no_inline_opt = 1;
+ break;
+
case OPTION_NO_TOC_OPT:
no_toc_opt = 1;
break;
case OPTION_TRADITIONAL_FORMAT:
no_tls_opt = 1;
- params.no_tls_get_addr_opt = 1;
+ params.tls_get_addr_opt = 0;
no_opd_opt = 1;
no_toc_opt = 1;
params.no_multi_toc = 1;