X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fppc64elf.em;h=59ea78693c3556623a1ffad83cc729e806a342cf;hb=0cdcdbf8dbadc70194d46b4c3400ba8cc2a10fc0;hp=0a49c5ba4cf8dc0c9d3899840379d5ab3559f8c0;hpb=bd518033e94e94717505ba617c9cc46beebffde8;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index 0a49c5ba4c..59ea78693c 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -1,6 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -29,25 +28,30 @@ fragment <the_bfd->flags |= BFD_LINKER_CREATED; ldlang_add_file (stub_file); - ppc64_elf_init_stub_bfd (stub_file->the_bfd, &link_info); + params.stub_bfd = stub_file->the_bfd; + if (params.save_restore_funcs < 0) + params.save_restore_funcs = !link_info.relocatable; + if (!ppc64_elf_init_stub_bfd (&link_info, ¶ms)) + einfo ("%F%P: can not init BFD: %E\n"); } /* Move the input section statement at *U which happens to be on LIST @@ -248,10 +246,10 @@ ppc_before_allocation (void) if (stub_file != NULL) { if (!no_opd_opt - && !ppc64_elf_edit_opd (&link_info, non_overlapping_opd)) + && !ppc64_elf_edit_opd (&link_info)) einfo ("%X%P: can not edit %s: %E\n", "opd"); - if (ppc64_elf_tls_setup (&link_info, no_tls_get_addr_opt, &no_multi_toc) + if (ppc64_elf_tls_setup (&link_info) && !no_tls_opt) { /* Size the sections. This is premature, but we want to know the @@ -370,7 +368,6 @@ ppc_add_stub_section (const char *stub_sec_name, asection *input_section) asection *stub_sec; flagword flags; asection *output_section; - const char *secname; lang_output_section_statement_type *os; struct hook_stub_info info; @@ -379,21 +376,20 @@ ppc_add_stub_section (const char *stub_sec_name, asection *input_section) 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, 5)) + || !bfd_set_section_alignment (stub_file->the_bfd, stub_sec, + plt_stub_align > 5 ? plt_stub_align : 5)) goto err_ret; output_section = input_section->output_section; - secname = bfd_get_section_name (output_section->owner, output_section); - os = lang_output_section_find (secname); + os = lang_output_section_get (output_section); info.input_section = input_section; lang_list_init (&info.add); - lang_add_section (&info.add, stub_sec, os); + lang_add_section (&info.add, stub_sec, NULL, os); if (info.add.head == NULL) goto err_ret; - stub_added = 1; if (hook_in_stub (&info, &os->children.head)) return stub_sec; @@ -414,8 +410,7 @@ ppc_layout_sections_again (void) gld${EMULATION_NAME}_map_segments (TRUE); if (!link_info.relocatable) - _bfd_set_gp_value (link_info.output_bfd, - ppc64_elf_toc (link_info.output_bfd)); + ppc64_elf_set_toc (&link_info, link_info.output_bfd); need_laying_out = -1; } @@ -428,7 +423,7 @@ build_toc_list (lang_statement_union_type *statement) { asection *i = statement->input_section.section; - if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag + if (i->sec_info_type != SEC_INFO_TYPE_JUST_SYMS && (i->flags & SEC_EXCLUDE) == 0 && i->output_section == toc_section) { @@ -446,7 +441,7 @@ build_section_lists (lang_statement_union_type *statement) { asection *i = statement->input_section.section; - if (!((lang_input_statement_type *) i->owner->usrdata)->just_syms_flag + if (!((lang_input_statement_type *) i->owner->usrdata)->flags.just_syms && (i->flags & SEC_EXCLUDE) == 0 && i->output_section != NULL && i->output_section->owner == link_info.output_bfd) @@ -463,27 +458,20 @@ build_section_lists (lang_statement_union_type *statement) static void gld${EMULATION_NAME}_after_allocation (void) { - /* bfd_elf_discard_info just plays with data and debugging sections, - ie. doesn't affect code size, so we can delay resizing the - sections. It's likely we'll resize everything in the process of - adding stubs. */ - if (bfd_elf_discard_info (link_info.output_bfd, &link_info)) - need_laying_out = 1; + int ret; /* If generating a relocatable output file, then we don't have any stubs. */ if (stub_file != NULL && !link_info.relocatable) { - int ret = ppc64_elf_setup_section_lists (&link_info, - &ppc_add_stub_section, - &ppc_layout_sections_again); + ret = ppc64_elf_setup_section_lists (&link_info); if (ret < 0) einfo ("%X%P: can not size stub section: %E\n"); - else if (ret > 0) + else { ppc64_elf_start_multitoc_partition (&link_info); - if (!no_multi_toc) + if (!params.no_multi_toc) { toc_section = bfd_get_section_by_name (link_info.output_bfd, ".got"); @@ -492,7 +480,7 @@ gld${EMULATION_NAME}_after_allocation (void) } if (ppc64_elf_layout_multitoc (&link_info) - && !no_multi_toc + && !params.no_multi_toc && toc_section != NULL) lang_for_each_statement (build_toc_list); @@ -504,18 +492,30 @@ gld${EMULATION_NAME}_after_allocation (void) 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, group_size, plt_static_chain)) + if (!ppc64_elf_size_stubs (&link_info)) einfo ("%X%P: can not size stub section: %E\n"); } } + /* We can't parse and merge .eh_frame until the glink .eh_frame has + been generated. Otherwise the glink .eh_frame CIE won't be + merged with other CIEs, and worse, the glink .eh_frame FDEs won't + be listed in .eh_frame_hdr. */ + ret = bfd_elf_discard_info (link_info.output_bfd, &link_info); + if (ret < 0) + { + einfo ("%X%P: .eh_frame/.stab edit: %E\n"); + return; + } + else if (ret > 0) + need_laying_out = 1; + if (need_laying_out != -1) { gld${EMULATION_NAME}_map_segments (need_laying_out); if (!link_info.relocatable) - _bfd_set_gp_value (link_info.output_bfd, - ppc64_elf_toc (link_info.output_bfd)); + ppc64_elf_set_toc (&link_info, link_info.output_bfd); } } @@ -525,42 +525,34 @@ gld${EMULATION_NAME}_after_allocation (void) static void gld${EMULATION_NAME}_finish (void) { + char *msg = NULL; + char *line, *endline; + /* e_entry on PowerPC64 points to the function descriptor for _start. If _start is missing, default to the first function descriptor in the .opd section. */ - entry_section = ".opd"; - - if (link_info.relocatable) + if (stub_file != NULL + && (elf_elfheader (link_info.output_bfd)->e_flags & EF_PPC64_ABI) == 1) + entry_section = ".opd"; + + if (params.emit_stub_syms < 0) + params.emit_stub_syms = 1; + if (stub_file != NULL + && !link_info.relocatable + && !ppc64_elf_build_stubs (&link_info, config.stats ? &msg : NULL)) + einfo ("%X%P: can not build stubs: %E\n"); + + fflush (stdout); + for (line = msg; line != NULL; line = endline) { - asection *toc = bfd_get_section_by_name (link_info.output_bfd, ".toc"); - if (toc != NULL - && bfd_section_size (link_info.output_bfd, toc) > 0x10000) - einfo ("%X%P: TOC section size exceeds 64k\n"); - } - - if (stub_added) - { - char *msg = NULL; - char *line, *endline; - - if (emit_stub_syms < 0) - emit_stub_syms = 1; - if (!ppc64_elf_build_stubs (emit_stub_syms, &link_info, - config.stats ? &msg : NULL)) - einfo ("%X%P: can not build stubs: %E\n"); - - fflush (stdout); - for (line = msg; line != NULL; line = endline) - { - endline = strchr (line, '\n'); - if (endline != NULL) - *endline++ = '\0'; - fprintf (stderr, "%s: %s\n", program_name, line); - } - fflush (stderr); - if (msg != NULL) - free (msg); + endline = strchr (line, '\n'); + if (endline != NULL) + *endline++ = '\0'; + fprintf (stderr, "%s: %s\n", program_name, line); } + fflush (stderr); + if (msg != NULL) + free (msg); ppc64_elf_restore_symbols (&link_info); finish_default (); @@ -657,9 +649,15 @@ 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_STUBSYMS (OPTION_NO_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_DOTSYMS (OPTION_NO_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) @@ -674,10 +672,16 @@ PARSE_AND_LIST_LONGOPTS=${PARSE_AND_LIST_LONGOPTS}' { "stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE }, { "plt-static-chain", no_argument, NULL, OPTION_PLT_STATIC_CHAIN }, { "no-plt-static-chain", no_argument, NULL, OPTION_NO_PLT_STATIC_CHAIN }, + { "plt-thread-safe", no_argument, NULL, OPTION_PLT_THREAD_SAFE }, + { "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 }, { "emit-stub-syms", no_argument, NULL, OPTION_STUBSYMS }, { "no-emit-stub-syms", no_argument, NULL, OPTION_NO_STUBSYMS }, { "dotsyms", no_argument, NULL, OPTION_DOTSYMS }, { "no-dotsyms", no_argument, NULL, OPTION_NO_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 }, { "no-tls-get-addr-optimize", no_argument, NULL, OPTION_NO_TLS_GET_ADDR_OPT }, { "no-opd-optimize", no_argument, NULL, OPTION_NO_OPD_OPT }, @@ -699,10 +703,22 @@ PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}' choose suitable defaults.\n" )); fprintf (file, _("\ - --plt-static-chain PLT call stubs should load r11.\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" + )); + fprintf (file, _("\ + --plt-thread-safe PLT call stubs with load-load barrier.\n" + )); + fprintf (file, _("\ + --no-plt-thread-safe PLT call stubs without barrier.\n" + )); + fprintf (file, _("\ + --plt-align [=] Align PLT call stubs to fit cache lines.\n" )); fprintf (file, _("\ - --no-plt-static-chain PLT call stubs should not load r11. (default)\n" + --no-plt-align Dont'\''t align individual PLT call stubs.\n" )); fprintf (file, _("\ --emit-stub-syms Label linker stubs with a symbol.\n" @@ -720,6 +736,14 @@ PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}' --no-dotsyms Don'\''t do anything special in version scripts.\n" )); fprintf (file, _("\ + --save-restore-funcs Provide register save and restore routines used\n\ + by gcc -Os code. Defaults to on for normal\n\ + final link, off for ld -r.\n" + )); + fprintf (file, _("\ + --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, _("\ @@ -747,26 +771,51 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}' case OPTION_STUBGROUP_SIZE: { const char *end; - group_size = bfd_scan_vma (optarg, &end, 0); + params.group_size = bfd_scan_vma (optarg, &end, 0); if (*end) einfo (_("%P%F: invalid number `%s'\''\n"), optarg); } break; case OPTION_PLT_STATIC_CHAIN: - plt_static_chain = 1; + params.plt_static_chain = 1; break; case OPTION_NO_PLT_STATIC_CHAIN: - plt_static_chain = 0; + params.plt_static_chain = 0; + break; + + case OPTION_PLT_THREAD_SAFE: + params.plt_thread_safe = 1; + break; + + case OPTION_NO_PLT_THREAD_SAFE: + params.plt_thread_safe = 0; + break; + + case OPTION_PLT_ALIGN: + 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); + plt_stub_align = val; + } + else + plt_stub_align = 5; + break; + + case OPTION_NO_PLT_ALIGN: + plt_stub_align = 0; break; case OPTION_STUBSYMS: - emit_stub_syms = 1; + params.emit_stub_syms = 1; break; case OPTION_NO_STUBSYMS: - emit_stub_syms = 0; + params.emit_stub_syms = 0; break; case OPTION_DOTSYMS: @@ -777,12 +826,20 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}' dotsyms = 0; break; + case OPTION_SAVRES: + params.save_restore_funcs = 1; + break; + + case OPTION_NO_SAVRES: + params.save_restore_funcs = 0; + break; + case OPTION_NO_TLS_OPT: no_tls_opt = 1; break; case OPTION_NO_TLS_GET_ADDR_OPT: - no_tls_get_addr_opt = 1; + params.no_tls_get_addr_opt = 1; break; case OPTION_NO_OPD_OPT: @@ -794,7 +851,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}' break; case OPTION_NO_MULTI_TOC: - no_multi_toc = 1; + params.no_multi_toc = 1; break; case OPTION_NO_TOC_SORT: @@ -802,8 +859,18 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}' break; case OPTION_NON_OVERLAPPING_OPD: - non_overlapping_opd = 1; + params.non_overlapping_opd = 1; break; + + case OPTION_TRADITIONAL_FORMAT: + no_tls_opt = 1; + params.no_tls_get_addr_opt = 1; + no_opd_opt = 1; + no_toc_opt = 1; + params.no_multi_toc = 1; + no_toc_sort = 1; + params.plt_static_chain = 1; + return FALSE; ' # Put these extra ppc64elf routines in ld_${EMULATION_NAME}_emulation