diff options
Diffstat (limited to 'ld')
40 files changed, 1325 insertions, 76 deletions
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em index b75a24b2580..35a459e64e7 100644 --- a/ld/emultempl/aarch64elf.em +++ b/ld/emultempl/aarch64elf.em @@ -271,7 +271,7 @@ gld${EMULATION_NAME}_after_allocation (void) } static void -gld${EMULATION_NAME}_finish (void) +aarch64_finish (void) { if (!bfd_link_relocatable (&link_info)) { @@ -283,7 +283,7 @@ gld${EMULATION_NAME}_finish (void) } } - finish_default (); + gld${EMULATION_NAME}_finish (); } /* This is a convenient point to tell BFD about target specific flags. @@ -435,4 +435,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=aarch64_elf_create_output_section_statem LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse # Call the extra arm-elf function -LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_FINISH=aarch64_finish diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em index 1db94c7f00f..403e684c82d 100644 --- a/ld/emultempl/alphaelf.em +++ b/ld/emultempl/alphaelf.em @@ -104,7 +104,7 @@ alpha_finish (void) if (limit_32bit) elf_elfheader (link_info.output_bfd)->e_flags |= EF_ALPHA_32BIT; - finish_default (); + gld${EMULATION_NAME}_finish (); } EOF diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 408d605b76b..1093c85cf5b 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -370,7 +370,7 @@ gld${EMULATION_NAME}_after_allocation (void) } static void -gld${EMULATION_NAME}_finish (void) +arm_finish (void) { struct bfd_link_hash_entry * h; @@ -393,7 +393,7 @@ gld${EMULATION_NAME}_finish (void) } } - finish_default (); + gld${EMULATION_NAME}_finish (); if (thumb_entry_symbol) { @@ -702,4 +702,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=arm_elf_create_output_section_statements LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse # Call the extra arm-elf function -LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_FINISH=arm_finish diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em index 18bd51d94da..152f8cc277a 100644 --- a/ld/emultempl/avrelf.em +++ b/ld/emultempl/avrelf.em @@ -209,7 +209,7 @@ avr_finish (void) else elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED; - finish_default (); + gld${EMULATION_NAME}_finish (); } EOF diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 8ff5fe0a261..82863c69058 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -66,6 +66,7 @@ static void gld${EMULATION_NAME}_before_allocation (void); static void gld${EMULATION_NAME}_after_allocation (void); static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan (asection *, const char *, int); +static void gld${EMULATION_NAME}_finish (void); EOF if [ "x${USE_LIBPATH}" = xyes ] ; then @@ -1793,6 +1794,8 @@ output_rel_find (asection *sec, int isdyn) return last; } +static int orphan_init_done = 0; + /* Place an orphan section. We use this to put random SHF_ALLOC sections in the right segment. */ @@ -1801,7 +1804,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s, const char *secname, int constraint) { - static struct orphan_save hold[] = + static struct orphan_save orig_hold[] = { { ".text", SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE, @@ -1831,6 +1834,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s, SEC_HAS_CONTENTS, 0, 0, 0, 0 }, }; + static struct orphan_save hold[ARRAY_SIZE (orig_hold)]; enum orphan_save_index { orphan_text = 0, @@ -1843,7 +1847,6 @@ gld${EMULATION_NAME}_place_orphan (asection *s, orphan_sdata, orphan_nonalloc }; - static int orphan_init_done = 0; struct orphan_save *place; lang_output_section_statement_type *after; lang_output_section_statement_type *os; @@ -1920,15 +1923,22 @@ gld${EMULATION_NAME}_place_orphan (asection *s, if (!orphan_init_done) { - struct orphan_save *ho; + struct orphan_save *ho, *horig; for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho) + for (ho = hold, horig = orig_hold; + ho < hold + ARRAY_SIZE (hold); + ++ho, ++horig) + { + *ho = *horig; + if (ho->name != NULL) if (ho->name != NULL) { ho->os = lang_output_section_find (ho->name); if (ho->os != NULL && ho->os->flags == 0) ho->os->flags = ho->flags; } + } orphan_init_done = 1; } @@ -1999,6 +2009,27 @@ gld${EMULATION_NAME}_place_orphan (asection *s, EOF fi +fragment <<EOF + +/* Final emulation specific call. */ + +static void +gld${EMULATION_NAME}_finish (void) +{ +EOF +if test x"$LDEMUL_PLACE_ORPHAN" != xgld"$EMULATION_NAME"_place_orphan; then +fragment <<EOF + /* Support the object-only output. */ + if (link_info.emit_gnu_object_only) + orphan_init_done = 0; + +EOF +fi +fragment <<EOF + finish_default (); +} +EOF + if test x"$LDEMUL_AFTER_ALLOCATION" != xgld"$EMULATION_NAME"_after_allocation; then fragment <<EOF @@ -2485,7 +2516,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = ${LDEMUL_GET_SCRIPT-gld${EMULATION_NAME}_get_script}, "${EMULATION_NAME}", "${OUTPUT_FORMAT}", - ${LDEMUL_FINISH-finish_default}, + ${LDEMUL_FINISH-gld${EMULATION_NAME}_finish}, ${LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS-NULL}, ${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive}, ${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan}, diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index bbf3ce0ff58..85c7d2639ac 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -215,7 +215,7 @@ ppc_finish (void) { if (params.ppc476_workaround) lang_for_each_statement (no_zero_padding); - finish_default (); + gld${EMULATION_NAME}_finish (); } EOF diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index 08bd5d422df..f97fa35a491 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -562,7 +562,7 @@ gld${EMULATION_NAME}_after_allocation (void) /* Final emulation specific call. */ static void -gld${EMULATION_NAME}_finish (void) +ppc_finish (void) { char *msg = NULL; char *line, *endline; @@ -594,7 +594,7 @@ gld${EMULATION_NAME}_finish (void) free (msg); ppc64_elf_restore_symbols (&link_info); - finish_default (); + gld${EMULATION_NAME}_finish (); } @@ -928,4 +928,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=ppc_create_output_section_statements LDEMUL_AFTER_OPEN=ppc_after_open LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation -LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_FINISH=ppc_finish diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index 88278ae03f0..4a6a485a687 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -416,7 +416,7 @@ spu_elf_relink (void) /* Final emulation specific call. */ static void -gld${EMULATION_NAME}_finish (void) +spu_finish (void) { if (is_spu_target ()) { @@ -432,7 +432,7 @@ gld${EMULATION_NAME}_finish (void) einfo ("%P: --auto-overlay ignored with zero local store range\n"); } - finish_default (); + gld${EMULATION_NAME}_finish (); } static char * @@ -832,5 +832,5 @@ PARSE_AND_LIST_ARGS_CASES=' LDEMUL_AFTER_OPEN=spu_after_open LDEMUL_BEFORE_ALLOCATION=spu_before_allocation -LDEMUL_FINISH=gld${EMULATION_NAME}_finish +LDEMUL_FINISH=spu_finish LDEMUL_CHOOSE_TARGET=gld${EMULATION_NAME}_choose_target diff --git a/ld/ldexp.c b/ld/ldexp.c index 7694f7b0ec0..1c363b46ee3 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -1613,14 +1613,15 @@ align_n (bfd_vma value, bfd_vma align) } void -ldexp_init (void) +ldexp_init (bfd_boolean object_only) { /* The value "13" is ad-hoc, somewhat related to the expected number of assignments in a linker script. */ - if (!bfd_hash_table_init_n (&definedness_table, - definedness_newfunc, - sizeof (struct definedness_hash_entry), - 13)) + if (!object_only + && !bfd_hash_table_init_n (&definedness_table, + definedness_newfunc, + sizeof (struct definedness_hash_entry), + 13)) einfo (_("%P%F: can not create hash table: %E\n")); } @@ -1655,7 +1656,8 @@ ldexp_finalize_syms (void) } void -ldexp_finish (void) +ldexp_finish (bfd_boolean object_only) { - bfd_hash_table_free (&definedness_table); + if (!object_only) + bfd_hash_table_free (&definedness_table); } diff --git a/ld/ldexp.h b/ld/ldexp.h index bea804555b3..14ea0f61f81 100644 --- a/ld/ldexp.h +++ b/ld/ldexp.h @@ -229,8 +229,8 @@ fill_type *exp_get_fill (etree_type *, fill_type *, char *); bfd_vma exp_get_abs_int (etree_type *, int, char *); -void ldexp_init (void); +void ldexp_init (bfd_boolean); void ldexp_finalize_syms (void); -void ldexp_finish (void); +void ldexp_finish (bfd_boolean); #endif diff --git a/ld/ldfile.c b/ld/ldfile.c index 96f9ecc0157..9002c3bd72c 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -313,7 +313,9 @@ success: && !no_more_claiming && bfd_check_format (entry->the_bfd, bfd_object)) plugin_maybe_claim (entry); + else #endif /* ENABLE_PLUGINS */ + cmdline_check_object_only_section (entry->the_bfd, FALSE); /* It opened OK, the format checked out, and the plugins have had their chance to claim it, so this is success. */ diff --git a/ld/ldlang.c b/ld/ldlang.c index 29869812acf..e1b07c3cbaf 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -36,6 +36,7 @@ #include "ldctor.h" #include "ldfile.h" #include "ldemul.h" +#include "ldwrite.h" #include "fnmatch.h" #include "demangle.h" #include "hashtab.h" @@ -45,6 +46,9 @@ #include "plugin.h" #endif /* ENABLE_PLUGINS */ +/* FIXME: Put it here to avoid NAME conflict from ldgram.h. */ +#include "elf-bfd.h" + #ifndef offsetof #define offsetof(TYPE, MEMBER) ((size_t) & (((TYPE*) 0)->MEMBER)) #endif @@ -68,6 +72,9 @@ static lang_statement_list_type *stat_save[10]; static lang_statement_list_type **stat_save_ptr = &stat_save[0]; static struct unique_sections *unique_section_list; static struct asneeded_minfo *asneeded_list_head; +static cmdline_list_type cmdline_object_only_file_list; +static cmdline_list_type cmdline_object_only_archive_list; +static cmdline_list_type cmdline_temp_object_only_list; /* Forward declarations. */ static void exp_init_os (etree_type *); @@ -86,6 +93,10 @@ static void lang_do_version_exports_section (void); static void lang_finalize_version_expr_head (struct bfd_elf_version_expr_head *); static void lang_do_memory_regions (void); +static void cmdline_lists_init (void); +static void cmdline_get_object_only_input_files (void); +static void print_cmdline_list (cmdline_union_type *); +static bfd_boolean cmdline_on_object_only_archive_list_p (bfd *); /* Exported variables. */ const char *output_target; @@ -1219,14 +1230,17 @@ output_section_statement_table_free (void) /* Build enough state so that the parser can build its tree. */ void -lang_init (void) +lang_init (bfd_boolean object_only) { - obstack_begin (&stat_obstack, 1000); + if (!object_only) + obstack_begin (&stat_obstack, 1000); stat_ptr = &statement_list; output_section_statement_table_init (); + cmdline_lists_init (); + lang_list_init (stat_ptr); lang_list_init (&input_file_chain); @@ -2831,6 +2845,12 @@ load_symbols (lang_input_statement_type *entry, loaded = FALSE; } + if (link_info.emitting_gnu_object_only) + { + if (!cmdline_on_object_only_archive_list_p (member)) + continue; + } + subsbfd = member; if (!(*link_info.callbacks ->add_archive_element) (&link_info, member, @@ -6763,7 +6783,38 @@ lang_process (void) open_input_bfds (statement_list.head, OPEN_BFD_RESCAN); } } + else #endif /* ENABLE_PLUGINS */ + if (bfd_link_relocatable (&link_info)) + { + /* Check if .gnu_object_only section should be created. */ + bfd *p; + int object_type; + + object_type = 0; + for (p = link_info.input_bfds; p != (bfd *) NULL; p = p->link.next) + { + object_type |= 1 << p->lto_type; + if ((object_type & (1 << lto_mixed_object)) != 0 + || ((object_type + & (1 << lto_non_ir_object + | 1 << lto_ir_object)) + == (1 << lto_non_ir_object | 1 << lto_ir_object))) + { + link_info.emit_gnu_object_only = TRUE; + break; + } + } + + if (verbose + && (cmdline_object_only_file_list.head + || cmdline_object_only_archive_list.head)) + { + info_msg (_("Object-only input files:\n ")); + print_cmdline_list (cmdline_object_only_file_list.head); + print_cmdline_list (cmdline_object_only_archive_list.head); + } + } link_info.gc_sym_list = &entry_symbol; if (entry_symbol.name == NULL) @@ -8258,3 +8309,965 @@ lang_print_memory_usage (void) printf (" %6.2f%%\n", percent); } } + +static void +cmdline_lists_init (void) +{ + cmdline_object_only_file_list.tail + = &cmdline_object_only_file_list.head; + cmdline_object_only_archive_list.tail + = &cmdline_object_only_archive_list.head; + cmdline_temp_object_only_list.tail + = &cmdline_temp_object_only_list.head; +} + +/* Allocate an item with TYPE and DATA. */ + +static cmdline_union_type * +cmdline_list_new (cmdline_enum_type type, void *data) +{ + cmdline_union_type *new_opt; + + new_opt = (cmdline_union_type *) stat_alloc (sizeof (*new_opt)); + new_opt->header.type = type; + switch (type) + { + default: + break; + case cmdline_is_file_enum: + new_opt->file.filename = (const char *) data; + break; + case cmdline_is_bfd_enum: + new_opt->abfd.abfd = (bfd *) data; + break; + } + return new_opt; +} + +/* Append an item with TYPE and DATA to LIST. */ + +static void +cmdline_list_append (cmdline_list_type *list, cmdline_enum_type type, + void *data) +{ + cmdline_union_type *new_opt = cmdline_list_new (type, data); + new_opt->header.next = NULL; + *list->tail = new_opt; + list->tail = &new_opt->header.next; +} + +static void +print_cmdline_list (cmdline_union_type *c) +{ + for (; c != NULL; c = c->header.next) + switch (c->header.type) + { + default: + abort (); + case cmdline_is_file_enum: + info_msg (" %s", c->file.filename); + break; + case cmdline_is_bfd_enum: + info_msg (" [%B]", c->abfd.abfd); + break; + } + + info_msg ("\n"); +} + +/* Return TRUE if ABFD is on cmdline_object_only_archive_list. */ + +static bfd_boolean +cmdline_on_object_only_archive_list_p (bfd *abfd) +{ + cmdline_union_type *c, *next; + bfd *archive, *obfd, *oarchive; + ufile_ptr origin = abfd->origin; + + archive = bfd_my_archive (abfd); + for (c = cmdline_object_only_archive_list.head; c != NULL; c = next) + { + if (c->header.type != cmdline_is_bfd_enum) + abort (); + + next = c->header.next; + obfd = c->abfd.abfd; + oarchive = bfd_my_archive (obfd); + + /* The list is grouped by archive file name and sorted by member + origin. */ + if (strcmp (archive->filename, oarchive->filename) != 0) + continue; + + if (origin == obfd->origin) + return TRUE; + else if (origin < obfd->origin) + return FALSE; + } + + return FALSE; +} + +/* Append an item with TYPE and DATA to cmdline_object_only_file_list + or cmdline_object_only_archive_list if needed. */ + +static void +cmdline_object_only_list_append (cmdline_enum_type type, void *data) +{ + cmdline_union_type *c; + cmdline_union_type *new_opt, *next, **prev; + bfd *abfd, *archive; + bfd *obfd, *oarchive; + bfd *nbfd, *narchive; + ufile_ptr origin, norigin; + + /* Put it on cmdline_object_only_file_list if it isn't an archive + member. */ + switch (type) + { + default: + abort (); + case cmdline_is_bfd_enum: + abfd = (bfd *) data; + archive = bfd_my_archive (abfd); + if (archive) + break; + case cmdline_is_file_enum: + cmdline_list_append (&cmdline_object_only_file_list, type, data); + return; + } + + /* Put archive member on cmdline_object_only_archive_list and sort + the list by archive name and archive member origin. */ + new_opt = (cmdline_union_type *) stat_alloc (sizeof (*new_opt)); + new_opt->header.type = cmdline_is_bfd_enum; + new_opt->header.next = NULL; + new_opt->abfd.abfd = (bfd *) data; + + c = cmdline_object_only_archive_list.head; + if (c == NULL) + { + cmdline_object_only_archive_list.head = new_opt; + cmdline_object_only_archive_list.tail = &new_opt->header.next; + return; + } + + prev = NULL; + origin = abfd->origin; + for (; c != NULL; c = next) + { + if (c->header.type != cmdline_is_bfd_enum) + abort (); + + next = c->header.next; + + obfd = c->abfd.abfd; + oarchive = bfd_my_archive (obfd); + + if (strcmp (archive->filename, oarchive->filename) == 0) + { + bfd_boolean after; + + if (origin < obfd->origin) + { + /* Insert it before the current. */ + new_opt->header.next = c; + if (prev) + *prev = new_opt; + else + cmdline_object_only_archive_list.head = new_opt; + return; + } + + after = TRUE; + + /* Check origin. */ + while (next) + { + if (next->header.type != cmdline_is_bfd_enum) + abort (); + + nbfd = next->abfd.abfd; + norigin = nbfd->origin; + if (origin > norigin) + { + /* Insert it after NEXT. */ + break; + } + + narchive = bfd_my_archive (nbfd); + if (strcmp (archive->filename, narchive->filename) != 0) + { + /* Insert it befor NEXT. */ + after = FALSE; + break; + } + + c = next; + next = next->header.next; + } + + if (after && next) + { + c = next; + next = next->header.next; + } + + if (*cmdline_object_only_archive_list.tail == c->header.next) + cmdline_object_only_archive_list.tail + = &new_opt->header.next; + + prev = &c->header.next; + new_opt->header.next = next; + *prev = new_opt; + return; + } + + prev = &c->header.next; + } + + *cmdline_object_only_archive_list.tail = new_opt; + cmdline_object_only_archive_list.tail = &new_opt->header.next; +} + +/* Get object-only input files. */ + +static void +cmdline_get_object_only_input_files (void) +{ + cmdline_union_type *c, *next; + bfd *abfd, *archive; + bfd *nbfd, *narchive; + + /* Add files first. */ + for (c = cmdline_object_only_file_list.head; + c != NULL; c = c->header.next) + switch (c->header.type) + { + default: + abort (); + case cmdline_is_file_enum: + lang_add_input_file (c->file.filename, + lang_input_file_is_file_enum, NULL); + break; + case cmdline_is_bfd_enum: + abfd = c->abfd.abfd; + if (bfd_my_archive (abfd)) + abort (); + lang_add_input_file (abfd->filename, + lang_input_file_is_file_enum, NULL); + break; + } + + /* Add archive members next. */ + for (c = cmdline_object_only_archive_list.head; c != NULL; c = next) + { + if (c->header.type != cmdline_is_bfd_enum) + abort (); + + next = c->header.next; + + abfd = c->abfd.abfd; + archive = bfd_my_archive (abfd); + + /* Add the first archive of the archive member group. */ + lang_add_input_file (archive->filename, + lang_input_file_is_file_enum, NULL); + + /* Skip the rest members in the archive member group. */ + do + { + if (!next) + break; + + if (next->header.type != cmdline_is_bfd_enum) + abort (); + + next = next->header.next; + if (!next) + break; + nbfd = next->abfd.abfd; + narchive = bfd_my_archive (nbfd); + } + while (strcmp (archive->filename, narchive->filename) == 0); + } +} + +struct cmdline_arg +{ + bfd *obfd; + asymbol **isympp; + int status; +}; + +/* Create a section in OBFD with the same + name and attributes as ISECTION in IBFD. */ + +static void +setup_section (bfd *ibfd, sec_ptr isection, void *p) +{ + struct cmdline_arg *arg = (struct cmdline_arg *) p; + bfd *obfd = arg->obfd; + asymbol **isympp = arg->isympp; + const char *name = isection->name; + sec_ptr osection; + const char *err; + + /* Skip the object-only section. */ + if (ibfd->object_only_section == isection) + return; + + /* If we have already failed earlier on, do not keep on generating + complaints now. */ + if (arg->status) + return; + + osection = bfd_make_section_anyway_with_flags (obfd, name, + isection->flags); + + if (osection == NULL) + { + err = _("failed to create output section"); + goto loser; + } + + osection->size = isection->size; + osection->vma = isection->vma; + osection->lma = isection->lma; + osection->alignment_power = isection->alignment_power; + + /* Copy merge entity size. */ + osection->entsize = isection->entsize; + + /* This used to be mangle_section; we do here to avoid using + bfd_get_section_by_name since some formats allow multiple + sections with the same name. */ + isection->output_section = osection; + isection->output_offset = 0; + + if ((isection->flags & SEC_GROUP) != 0) + { + asymbol *gsym = bfd_group_signature (isection, isympp); + + if (gsym != NULL) + { + gsym->flags |= BSF_KEEP; + if (ibfd->xvec->flavour == bfd_target_elf_flavour) + elf_group_id (isection) = gsym; + } + } + + /* Allow the BFD backend to copy any private data it understands + from the input section to the output section. */ + if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection)) + { + err = _("failed to copy private data"); + goto loser; + } + + /* All went well. */ + return; + +loser: + arg->status = 1; + einfo (_("%P%F: setup_section: %s: %s\n"), err, name); +} + +/* Copy the data of input section ISECTION of IBFD + to an output section with the same name in OBFD. + If stripping then don't copy any relocation info. */ + +static void +copy_section (bfd *ibfd, sec_ptr isection, void *p) +{ + struct cmdline_arg *arg = (struct cmdline_arg *) p; + bfd *obfd = arg->obfd; + asymbol **isympp = arg->isympp; + arelent **relpp; + long relcount; + sec_ptr osection; + bfd_size_type size; + long relsize; + flagword flags; + const char *err; + + /* Skip the object-only section. */ + if (ibfd->object_only_section == isection) + return; + + /* If we have already failed earlier on, do not keep on generating + complaints now. */ + if (arg->status) + return; + + flags = bfd_get_section_flags (ibfd, isection); + if ((flags & SEC_GROUP) != 0) + return; + + osection = isection->output_section; + size = bfd_get_section_size (isection); + + if (size == 0 || osection == 0) + return; + + relsize = bfd_get_reloc_upper_bound (ibfd, isection); + + if (relsize < 0) + { + /* Do not complain if the target does not support relocations. */ + if (relsize == -1 + && bfd_get_error () == bfd_error_invalid_operation) + relsize = 0; + else + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + } + + if (relsize == 0) + bfd_set_reloc (obfd, osection, NULL, 0); + else + { + relpp = (arelent **) xmalloc (relsize); + relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, isympp); + if (relcount < 0) + { + err = _("relocation count is negative"); + goto loser; + } + + bfd_set_reloc (obfd, osection, + relcount == 0 ? NULL : relpp, relcount); + if (relcount == 0) + free (relpp); + } + + if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS) + { + bfd_byte *memhunk = NULL; + + if (!bfd_get_full_section_contents (ibfd, isection, &memhunk)) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + if (!bfd_set_section_contents (obfd, osection, memhunk, 0, size)) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + free (memhunk); + } + + /* All went well. */ + return; + +loser: + einfo (_("%P%F: copy_section: %s: %s\n"), err, isection->name); +} +/* Open the temporary bfd created in the same directory as PATH. */ + +static bfd * +cmdline_fopen_temp (const char *path, const char *target, + const char *mode) +{ +#define template "ldXXXXXX" + const char *slash = strrchr (path, '/'); + char *tmpname; + size_t len; + int fd; + +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (path, '\\'); + + if (slash == NULL || (bslash != NULL && bslash > slash)) + slash = bslash; + if (slash == NULL && path[0] != '\0' && path[1] == ':') + slash = path + 1; + } +#endif + + if (slash != (char *) NULL) + { + len = slash - path; + tmpname = (char *) xmalloc (len + sizeof (template) + 2); + memcpy (tmpname, path, len); + +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + /* If tmpname is "X:", appending a slash will make it a root + directory on drive X, which is NOT the same as the current + directory on drive X. */ + if (len == 2 && tmpname[1] == ':') + tmpname[len++] = '.'; +#endif + tmpname[len++] = '/'; + } + else + { + tmpname = (char *) xmalloc (sizeof (template)); + len = 0; + } + + memcpy (tmpname + len, template, sizeof (template)); +#undef template + +#ifdef HAVE_MKSTEMP + fd = mkstemp (tmpname); +#else + tmpname = mktemp (tmpname); + if (tmpname == NULL) + return NULL; + fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600); +#endif + if (fd == -1) + return NULL; + return bfd_fopen (tmpname, target, mode, fd); +} + +/* Add the object-only section. */ + +static void +cmdline_add_object_only_section (bfd_byte *contents, size_t size) +{ + bfd_vma start; + flagword flags; + enum bfd_architecture iarch; + unsigned int imach; + long symcount; + long symsize; + asymbol **isympp = NULL; + asymbol **osympp = NULL; + bfd *obfd = NULL, *ibfd; + const char *err; + struct arg + { + bfd *obfd; + asymbol **isympp; + int status; + } arg; + char **matching; + char *ofilename = NULL; + asection *sec; + + ibfd = bfd_openr (output_filename, output_target); + if (!ibfd) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + if (!bfd_check_format_matches (ibfd, bfd_object, &matching)) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + obfd = cmdline_fopen_temp (output_filename, output_target, "w"); + if (!obfd) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + /* To be used after bfd_close (). */ + ofilename = xstrdup (bfd_get_filename (obfd)); + + if (!bfd_set_format (obfd, bfd_object)) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + /* Copy the start address, flags and architecture of input file to + output file. */ + flags = bfd_get_file_flags (ibfd); + start = bfd_get_start_address (ibfd); + iarch = bfd_get_arch (ibfd); + imach = bfd_get_mach (ibfd); + if (!bfd_set_start_address (obfd, start) + || !bfd_set_file_flags (obfd, flags) + || !bfd_set_arch_mach (obfd, iarch, imach)) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + symsize = bfd_get_symtab_upper_bound (ibfd); + if (symsize < 0) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + isympp = (asymbol **) xmalloc (symsize); + symcount = bfd_canonicalize_symtab (ibfd, isympp); + if (symcount < 0) + { + err = bfd_errmsg (bfd_get_error ()); + goto loser; + } + + arg.obfd = obfd; + arg.isympp = isympp; + arg.status = 0; + + /* BFD mandates that all output sections be created and sizes set before + any output is done. Thus, we traverse all sections multiple times. */ + bfd_map_over_sections (ibfd, setup_section, &arg); + + if (arg.status) + { + err = _("error setting up sections"); + goto loser; + } + + /* Allow the BFD backend to copy any private data it understands + from the input section to the output section. */ + if (! bfd_copy_private_header_data (ibfd, obfd)) + { + err = _("error copying private header data"); + goto loser; + } + + /* Create the object-only section. */ + sec = bfd_make_section_with_flags (obfd, + GNU_OBJECT_ONLY_SECTION_NAME, + (SEC_HAS_CONTENTS + | SEC_READONLY + | SEC_DATA + | SEC_LINKER_CREATED)); + if (sec == NULL) + { + err = _("can't create object-only section"); + goto loser; + } + + if (! bfd_set_section_size (obfd, sec, size)) + { + err = _("can't set object-only section size"); + goto loser; + } + + if (ibfd->object_only_section) + { + /* Filter out the object-only section symbol. */ + long src_count = 0, dst_count = 0; + asymbol **from, **to; + + osympp = (asymbol **) xmalloc (symcount * sizeof (asymbol *)); + from = isympp; + to = osympp; + for (; src_count < symcount; src_count++) + { + asymbol *sym = from[src_count]; + if (bfd_get_section (sym) != ibfd->object_only_section) + to[dst_count++] = sym; + } + to[dst_count] = NULL; + symcount = dst_count; + bfd_set_symtab (obfd, osympp, symcount); + } + else + bfd_set_symtab (obfd, isympp, symcount); + + /* This has to happen after the symbol table has been set. */ + bfd_map_over_sections (ibfd, copy_section, &arg); + + if (arg.status) + { + err = _("error copying sections"); + goto loser; + } + + /* Copy the object-only section to the output. */ + if (! bfd_set_section_contents (obfd, sec, contents, 0, size)) + { + err = _("error adding object-only section"); + goto loser; + } + + /* Allow the BFD backend to copy any private data it understands + from the input BFD to the output BFD. This is done last to + permit the routine to look at the filtered symbol table, which is + important for the ECOFF code at least. */ + if (! bfd_copy_private_bfd_data (ibfd, obfd)) + { + err = _("error copying private BFD data"); + goto loser; + } + + if (!bfd_close (obfd)) + { + unlink (ofilename); + einfo (_("%P%F: failed to finish output with object-only section\n")); + } + + /* Must be freed after bfd_close (). */ + free (isympp); + if (osympp) + free (osympp); + + if (rename (ofilename, output_filename)) + { + unlink (ofilename); + einfo (_("%P%F: failed to rename output with object-only section\n")); + } + + free (ofilename); + return; + +loser: + if (isympp) + free (isympp); + if (osympp) + free (osympp); + if (obfd) + bfd_close (obfd); + if (ofilename) + unlink (ofilename); + einfo (_("%P%F: failed to add object-only section: %s\n"), err); +} + +/* Emit the final output with object-only section. */ + +void +cmdline_emit_object_only_section (void) +{ + const char *saved_output_filename = output_filename; + int fd; + size_t size, off; + bfd_byte *contents; + struct stat st; + + /* Get a temporary object-only file. */ + output_filename = make_temp_file (".obj-only.o"); + + had_output_filename = FALSE; + link_info.input_bfds = NULL; + link_info.input_bfds_tail = &link_info.input_bfds; + + lang_init (TRUE); + ldexp_init (TRUE); + + ld_parse_linker_script (); + + /* Set up the object-only output. */ + lang_final (); + + /* Open the object-only file for output. */ + lang_for_each_statement (ldlang_open_output); + + ldemul_create_output_section_statements (); + + if (!bfd_section_already_linked_table_init ()) + einfo (_("%P%F: Failed to create hash table\n")); + + /* Call cmdline_on_object_only_archive_list_p to check which member + should be loaded. */ + input_flags.whole_archive = TRUE; + + /* Set it to avoid adding more to cmdline lists. */ + link_info.emitting_gnu_object_only = TRUE; + + /* Get object-only input files. */ + cmdline_get_object_only_input_files (); + + /* Open object-only input files. */ + open_input_bfds (statement_list.head, FALSE); + + ldemul_after_open (); + + bfd_section_already_linked_table_free (); + + /* Make sure that we're not mixing architectures. We call this + after all the input files have been opened, but before we do any + other processing, so that any operations merge_private_bfd_data + does on the output file will be known during the rest of the + link. */ + lang_check (); + + /* Size up the common data. */ + lang_common (); + + /* Update wild statements. */ + update_wild_statements (statement_list.head); + + /* Run through the contours of the script and attach input sections + to the correct output sections. */ + map_input_to_output_sections (statement_list.head, NULL, NULL); + + /* Find any sections not attached explicitly and handle them. */ + lang_place_orphans (); + + /* Do anything special before sizing sections. This is where ELF + and other back-ends size dynamic sections. */ + ldemul_before_allocation (); + + /* Size up the sections. */ + lang_size_sections (NULL, ! RELAXATION_ENABLED); + + /* See if anything special should be done now we know how big + everything is. This is where relaxation is done. */ + ldemul_after_allocation (); + + ldemul_finish (); + + /* Make sure that the section addresses make sense. */ + if (command_line.check_section_addresses) + lang_check_section_addresses (); + + lang_end (); + + ldwrite (); + + ldexp_finish (TRUE); + lang_finish (); + + if (! bfd_close (link_info.output_bfd)) + einfo (_("%P%F:%s: final close failed on object-only output: %E\n"), + output_filename); + + /* Read in the object-only file. */ + fd = open (output_filename, O_RDONLY | O_BINARY); + if (fd < 0) + { + bfd_set_error (bfd_error_system_call); + einfo (_("%P%F:%s: cannot open object-only output: %E"), + output_filename); + } + + /* Get the object-only file size. */ + if (fstat (fd, &st) != 0) + { + bfd_set_error (bfd_error_system_call); + einfo (_("%P%F:%s: cannot stat object-only output: %E"), + output_filename); + } + + size = st.st_size; + off = 0; + contents = (bfd_byte *) xmalloc (size); + while (off != size) + { + ssize_t got; + + got = read (fd, contents + off, size - off); + if (got < 0) + { + bfd_set_error (bfd_error_system_call); + einfo (_("%P%F:%s: read failed on object-only output: %E"), + output_filename); + } + + off += got; + } + + close (fd); + + /* Remove the temporary object-only file. */ + unlink (output_filename); + + output_filename = saved_output_filename; + + cmdline_add_object_only_section (contents, size); + + free (contents); +} + +/* Extract the object-only section. */ + +static const char * +cmdline_extract_object_only_section (bfd *abfd) +{ + const char *name = bfd_extract_object_only_section (abfd); + + if (name == NULL) + einfo (_("%P%F: cannot extract object-only section from %B: %E"), + abfd); + + /* It should be removed after it is done. */ + cmdline_list_append (&cmdline_temp_object_only_list, + cmdline_is_file_enum, (void *) name); + + return name; +} + +/* Check and handle the object-only section. */ + +void +cmdline_check_object_only_section (bfd *abfd, bfd_boolean lto) +{ + const char *filename; + + if (link_info.emitting_gnu_object_only + || abfd->format != bfd_object) + return; + + if (lto) + { + /* For LTO link, we only need to extract object-only section + from the mixed object, add it to input, and put it on LTO + claimed output. */ + switch (abfd->lto_type) + { + default: + abort (); + case lto_mixed_object: + filename = cmdline_extract_object_only_section (abfd); + lang_add_input_file (filename, + lang_input_file_is_file_enum, NULL); + break; + case lto_non_ir_object: + case lto_ir_object: + break; + } + } + else if (bfd_link_relocatable (&link_info)) + { + /* For non-LTO relocatable link, we need to append non-IR object + file and the object file in object-only section to the object + only list. */ + switch (abfd->lto_type) + { + default: + abort (); + case lto_mixed_object: + filename = cmdline_extract_object_only_section (abfd); + cmdline_object_only_list_append (cmdline_is_file_enum, + (void *) filename); + break; + case lto_non_ir_object: + cmdline_object_only_list_append (cmdline_is_bfd_enum, abfd); + break; + case lto_ir_object: + break; + } + } +} + +/* Remove temporary object-only files. */ + +void +cmdline_remove_object_only_files (void) +{ + cmdline_union_type *c; + +#ifdef ENABLE_PLUGINS + if (plugin_save_temps) + return; +#endif + + c = cmdline_temp_object_only_list.head; + for (; c != NULL; c = c->header.next) + switch (c->header.type) + { + default: + abort (); + case cmdline_is_file_enum: + unlink (c->file.filename); + break; + } +} diff --git a/ld/ldlang.h b/ld/ldlang.h index 4b7e65df541..3c3dc8c1e40 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -517,7 +517,7 @@ extern struct asneeded_minfo **asneeded_list_tail; extern void (*output_bfd_hash_table_free_fn) (struct bfd_link_hash_table *); extern void lang_init - (void); + (bfd_boolean); extern void lang_finish (void); extern lang_memory_region_type * lang_memory_region_lookup @@ -693,4 +693,45 @@ lang_ld_feature (char *); extern void lang_print_memory_usage (void); +typedef enum +{ + cmdline_is_file_enum, + cmdline_is_bfd_enum +} cmdline_enum_type; + +typedef struct cmdline_header_struct +{ + union cmdline_union *next; + cmdline_enum_type type; +} cmdline_header_type; + +typedef struct cmdline_file_struct +{ + cmdline_header_type header; + const char *filename; +} cmdline_file_type; + +typedef struct cmdline_bfd_struct +{ + cmdline_header_type header; + bfd *abfd; +} cmdline_bfd_type; + +typedef union cmdline_union +{ + cmdline_header_type header; + cmdline_file_type file; + cmdline_bfd_type abfd; +} cmdline_union_type; + +typedef struct cmdline_list +{ + cmdline_union_type *head; + cmdline_union_type **tail; +} cmdline_list_type; + +extern void cmdline_emit_object_only_section (void); +extern void cmdline_check_object_only_section (bfd *, bfd_boolean); +extern void cmdline_remove_object_only_files (void); + #endif diff --git a/ld/ldlex.h b/ld/ldlex.h index 6f11e7bd217..427ffba9890 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -134,6 +134,7 @@ enum option_values #ifdef ENABLE_PLUGINS OPTION_PLUGIN, OPTION_PLUGIN_OPT, + OPTION_PLUGIN_SAVE_TEMPS, #endif /* ENABLE_PLUGINS */ OPTION_DEFAULT_SCRIPT, OPTION_PRINT_OUTPUT_FORMAT, diff --git a/ld/ldmain.c b/ld/ldmain.c index 96d7fe81ef7..4746a11cbf2 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -219,6 +219,9 @@ main (int argc, char **argv) xatexit (ld_cleanup); + /* Remove temporary object-only files. */ + xatexit (cmdline_remove_object_only_files); + /* Set up the sysroot directory. */ ld_sysroot = get_sysroot (argc, argv); if (*ld_sysroot) @@ -288,8 +291,8 @@ main (int argc, char **argv) default_target = ldemul_choose_target (argc, argv); config.maxpagesize = bfd_emul_get_maxpagesize (default_target); config.commonpagesize = bfd_emul_get_commonpagesize (default_target); - lang_init (); - ldexp_init (); + lang_init (FALSE); + ldexp_init (FALSE); ldemul_before_parse (); lang_has_input_file = FALSE; parse_args (argc, argv); @@ -304,34 +307,7 @@ main (int argc, char **argv) ldemul_set_symbols (); - /* If we have not already opened and parsed a linker script, - try the default script from command line first. */ - if (saved_script_handle == NULL - && command_line.default_script != NULL) - { - ldfile_open_command_file (command_line.default_script); - parser_input = input_script; - yyparse (); - } - - /* If we have not already opened and parsed a linker script - read the emulation's appropriate default script. */ - if (saved_script_handle == NULL) - { - int isfile; - char *s = ldemul_get_script (&isfile); - - if (isfile) - ldfile_open_default_command_file (s); - else - { - lex_string = s; - lex_redirect (s, _("built in linker script"), 1); - } - parser_input = input_script; - yyparse (); - lex_string = NULL; - } + ld_parse_linker_script (); if (verbose) { @@ -442,7 +418,7 @@ main (int argc, char **argv) fprintf (stderr, "lookup = %p val %lx\n", h, h ? h->u.def.value : 1); } #endif - ldexp_finish (); + ldexp_finish (FALSE); lang_finish (); /* Even if we're producing relocatable output, some non-fatal errors should @@ -462,6 +438,8 @@ main (int argc, char **argv) if (! bfd_close (link_info.output_bfd)) einfo (_("%F%B: final close failed: %E\n"), link_info.output_bfd); + link_info.output_bfd = NULL; + /* If the --force-exe-suffix is enabled, and we're making an executable file and it doesn't end in .exe, copy it to one which does. */ @@ -509,6 +487,9 @@ main (int argc, char **argv) } } + if (link_info.emit_gnu_object_only) + cmdline_emit_object_only_section (); + END_PROGRESS (program_name); if (config.stats) @@ -802,7 +783,9 @@ add_archive_element (struct bfd_link_info *info, *subsbfd = input->the_bfd; } } + else #endif /* ENABLE_PLUGINS */ + cmdline_check_object_only_section (input->the_bfd, FALSE); ldlang_add_file (input); @@ -1481,3 +1464,38 @@ notice (struct bfd_link_info *info, return TRUE; } + +/* Parse the linker script. */ + +void +ld_parse_linker_script () +{ + /* If we have not already opened and parsed a linker script, + try the default script from command line first. */ + if (saved_script_handle == NULL + && command_line.default_script != NULL) + { + ldfile_open_command_file (command_line.default_script); + parser_input = input_script; + yyparse (); + } + + /* If we have not already opened and parsed a linker script + read the emulation's appropriate default script. */ + if (saved_script_handle == NULL) + { + int isfile; + char *s = ldemul_get_script (&isfile); + + if (isfile) + ldfile_open_default_command_file (s); + else + { + lex_string = s; + lex_redirect (s, _("built in linker script"), 1); + } + parser_input = input_script; + yyparse (); + lex_string = NULL; + } +} diff --git a/ld/ldmain.h b/ld/ldmain.h index 6c13494eb2c..c7dd6a57df2 100644 --- a/ld/ldmain.h +++ b/ld/ldmain.h @@ -59,4 +59,6 @@ extern void add_wrap (const char *); extern void add_ignoresym (struct bfd_link_info *, const char *); extern void add_keepsyms_file (const char *); +extern void ld_parse_linker_script (void); + #endif diff --git a/ld/lexsup.c b/ld/lexsup.c index fdd39a73dc2..bac78e2d748 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -169,6 +169,9 @@ static const struct ld_option ld_options[] = '\0', N_("PLUGIN"), N_("Load named plugin"), ONE_DASH }, { {"plugin-opt", required_argument, NULL, OPTION_PLUGIN_OPT}, '\0', N_("ARG"), N_("Send arg to last-loaded plugin"), ONE_DASH }, + { {"plugin-save-temps", no_argument, NULL, OPTION_PLUGIN_SAVE_TEMPS}, + '\0', NULL, N_("Store plugin intermediate files permanently"), + ONE_DASH }, { {"flto", optional_argument, NULL, OPTION_IGNORE}, '\0', NULL, N_("Ignored for GCC LTO option compatibility"), ONE_DASH }, @@ -999,6 +1002,9 @@ parse_args (unsigned argc, char **argv) if (plugin_opt_plugin_arg (optarg)) einfo(_("%P%F: bad -plugin-opt option\n")); break; + case OPTION_PLUGIN_SAVE_TEMPS: + plugin_save_temps = TRUE; + break; #endif /* ENABLE_PLUGINS */ case 'q': link_info.emitrelocations = TRUE; diff --git a/ld/plugin.c b/ld/plugin.c index 8e53255ecd4..2145d9ca2a8 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -57,6 +57,9 @@ extern int errno; /* Report plugin symbols. */ bfd_boolean report_plugin_symbols; +/* Store plugin intermediate files permanently. */ +bfd_boolean plugin_save_temps; + /* The suffix to append to the name of the real (claimed) object file when generating a dummy BFD to hold the IR symbols sent from the plugin. For cosmetic use only; appears in maps, crefs etc. */ @@ -1180,6 +1183,9 @@ plugin_maybe_claim (lang_input_statement_type *entry) { bfd *abfd = entry->the_bfd->plugin_dummy_bfd; + /* Check object only section. */ + cmdline_check_object_only_section (entry->the_bfd, TRUE); + /* Discard the real file's BFD and substitute the dummy one. */ /* BFD archive handling caches elements so we can't call @@ -1225,14 +1231,17 @@ plugin_call_cleanup (void) { if (curplug->cleanup_handler && !curplug->cleanup_done) { - enum ld_plugin_status rv; - curplug->cleanup_done = TRUE; - called_plugin = curplug; - rv = (*curplug->cleanup_handler) (); - called_plugin = NULL; - if (rv != LDPS_OK) - info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"), - curplug->name, rv); + if (!plugin_save_temps) + { + enum ld_plugin_status rv; + curplug->cleanup_done = TRUE; + called_plugin = curplug; + rv = (*curplug->cleanup_handler) (); + called_plugin = NULL; + if (rv != LDPS_OK) + info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"), + curplug->name, rv); + } dlclose (curplug->dlhandle); } curplug = curplug->next; diff --git a/ld/plugin.h b/ld/plugin.h index 59c0df76e67..bf92dd99a2d 100644 --- a/ld/plugin.h +++ b/ld/plugin.h @@ -24,6 +24,9 @@ /* Report plugin symbols. */ extern bfd_boolean report_plugin_symbols; +/* Store plugin intermediate files permanently. */ +extern bfd_boolean plugin_save_temps; + /* Set at all symbols read time, to avoid recursively offering the plugin its own newly-added input files and libs to claim. */ extern bfd_boolean no_more_claiming; diff --git a/ld/scripttempl/armbpabi.sc b/ld/scripttempl/armbpabi.sc index d36d973b567..a430a3ea787 100644 --- a/ld/scripttempl/armbpabi.sc +++ b/ld/scripttempl/armbpabi.sc @@ -36,7 +36,7 @@ INTERP=".interp 0 : { *(.interp) }" PLT=".plt ${RELOCATING-0} : { *(.plt) }" RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" if test -z "${NO_SMALL_DATA}"; then SBSS=".sbss ${RELOCATING-0} : { diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index ec78c908267..6e62f007b21 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -170,7 +170,7 @@ RELA_IPLT=".rela.iplt ${RELOCATING-0} : DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" RODATA=".${RODATA_NAME} ${RELOCATING-0} : { *(.${RODATA_NAME}${RELOCATING+ .${RODATA_NAME}.* .gnu.linkonce.r.*}) }" DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" if test -z "${NO_SMALL_DATA}"; then SBSS=".${SBSS_NAME} ${RELOCATING-0} : { diff --git a/ld/scripttempl/elf32sh-symbian.sc b/ld/scripttempl/elf32sh-symbian.sc index a5f668cb340..24f068ea949 100644 --- a/ld/scripttempl/elf32sh-symbian.sc +++ b/ld/scripttempl/elf32sh-symbian.sc @@ -88,7 +88,7 @@ fi PLT=".plt : { *(.plt) } :dynamic :dyn" DYNAMIC=".dynamic : { *(.dynamic) } :dynamic :dyn" RODATA=".rodata ALIGN(4) : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive) *(.gnu.lto_*) *(.gnu_object_only) }" test -z "$GOT" && GOT=".got ${RELOCATING-0} : { *(.got.plt) *(.got) } :dynamic :dyn" INIT_ARRAY=".init_array ${RELOCATING-0} : { diff --git a/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc index 663b0732118..91e3db5da6d 100644 --- a/ld/scripttempl/elf64hppa.sc +++ b/ld/scripttempl/elf64hppa.sc @@ -132,7 +132,7 @@ fi DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" if test -z "${NO_SMALL_DATA}"; then SBSS=".sbss ${RELOCATING-0} : { diff --git a/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc index 91e7c22b67b..13a31cf53bf 100644 --- a/ld/scripttempl/elfxtensa.sc +++ b/ld/scripttempl/elfxtensa.sc @@ -145,7 +145,7 @@ fi DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" INIT_LIT=".init.literal 0 : { *(.init.literal) }" INIT=".init 0 : { *(.init) }" FINI_LIT=".fini.literal 0 : { *(.fini.literal) }" diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc index a744b5b7a5c..f0de094d312 100644 --- a/ld/scripttempl/mep.sc +++ b/ld/scripttempl/mep.sc @@ -119,7 +119,7 @@ fi DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }" DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }" -DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }" +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }" if test -z "${NO_SMALL_DATA}"; then SBSS=".sbss ${RELOCATING-0} : { diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc index 0adc78bf512..287f2301670 100644 --- a/ld/scripttempl/pe.sc +++ b/ld/scripttempl/pe.sc @@ -165,6 +165,7 @@ SECTIONS *(.drectve) ${RELOCATING+ *(.note.GNU-stack)} ${RELOCATING+ *(.gnu.lto_*)} + ${RELOCATING+ *(.gnu_object_only)} } .idata ${RELOCATING+BLOCK(__section_alignment__)} : diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc index 6e78b217819..73b609ef4c3 100644 --- a/ld/scripttempl/pep.sc +++ b/ld/scripttempl/pep.sc @@ -178,6 +178,7 @@ SECTIONS *(.drectve) ${RELOCATING+ *(.note.GNU-stack)} ${RELOCATING+ *(.gnu.lto_*)} + ${RELOCATING+ *(.gnu_object_only)} } .idata ${RELOCATING+BLOCK(__section_alignment__)} : diff --git a/ld/testsuite/ld-plugin/lto-10.out b/ld/testsuite/ld-plugin/lto-10.out new file mode 100644 index 00000000000..ce013625030 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-10.out @@ -0,0 +1 @@ +hello diff --git a/ld/testsuite/ld-plugin/lto-10a.c b/ld/testsuite/ld-plugin/lto-10a.c new file mode 100644 index 00000000000..93d57b520cb --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-10a.c @@ -0,0 +1,6 @@ +extern int foo(void); + +int main(void) +{ + return foo(); +} diff --git a/ld/testsuite/ld-plugin/lto-10b.c b/ld/testsuite/ld-plugin/lto-10b.c new file mode 100644 index 00000000000..507055be341 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-10b.c @@ -0,0 +1,7 @@ +#include <stdio.h> + +int foo(void) +{ + printf ("hello\n"); + return 0; +} diff --git a/ld/testsuite/ld-plugin/lto-10r.d b/ld/testsuite/ld-plugin/lto-10r.d new file mode 100644 index 00000000000..689e6ec2ef9 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-10r.d @@ -0,0 +1,7 @@ +#ld: -r tmpdir/lto-10a.o tmpdir/lto-10b.o +#source: dummy.s +#nm: -p + +#... +[0-9a-f]+ C __gnu_lto_v.* +#pass diff --git a/ld/testsuite/ld-plugin/lto-4.out b/ld/testsuite/ld-plugin/lto-4.out new file mode 100644 index 00000000000..8d8cc9240c8 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4.out @@ -0,0 +1,2 @@ +hello bar +hello foo diff --git a/ld/testsuite/ld-plugin/lto-4a.c b/ld/testsuite/ld-plugin/lto-4a.c new file mode 100644 index 00000000000..2d07cf585da --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4a.c @@ -0,0 +1,7 @@ +extern void foo(void); + +int main(void) +{ + foo(); + return 0; +} diff --git a/ld/testsuite/ld-plugin/lto-4b.c b/ld/testsuite/ld-plugin/lto-4b.c new file mode 100644 index 00000000000..bb4a68bb986 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4b.c @@ -0,0 +1,9 @@ +#include <stdio.h> + +extern void bar (void); + +void foo(void) +{ + bar (); + printf ("hello foo\n"); +} diff --git a/ld/testsuite/ld-plugin/lto-4c.c b/ld/testsuite/ld-plugin/lto-4c.c new file mode 100644 index 00000000000..317e6fcdacd --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4c.c @@ -0,0 +1,6 @@ +#include <stdio.h> + +void bar (void) +{ + printf ("hello bar\n"); +} diff --git a/ld/testsuite/ld-plugin/lto-4r-a.d b/ld/testsuite/ld-plugin/lto-4r-a.d new file mode 100644 index 00000000000..c618cffb028 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4r-a.d @@ -0,0 +1,7 @@ +#ld: -r tmpdir/lto-4a.o tmpdir/lto-4b.o tmpdir/lto-4c.o +#source: dummy.s +#objdump: -h + +#... +.* .gnu_object_only.* +#pass diff --git a/ld/testsuite/ld-plugin/lto-4r-b.d b/ld/testsuite/ld-plugin/lto-4r-b.d new file mode 100644 index 00000000000..07d71cb5328 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4r-b.d @@ -0,0 +1,7 @@ +#ld: -r tmpdir/lto-4a.o tmpdir/lto-4b.o +#source: dummy.s +#objdump: -h + +#... +.* .gnu_object_only.* +#pass diff --git a/ld/testsuite/ld-plugin/lto-4r-c.d b/ld/testsuite/ld-plugin/lto-4r-c.d new file mode 100644 index 00000000000..ada50c0355d --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4r-c.d @@ -0,0 +1,7 @@ +#ld: -r tmpdir/lto-4r-b.o tmpdir/lto-4c.o +#source: dummy.s +#objdump: -h + +#... +.* .gnu_object_only.* +#pass diff --git a/ld/testsuite/ld-plugin/lto-4r-d.d b/ld/testsuite/ld-plugin/lto-4r-d.d new file mode 100644 index 00000000000..d4c58526cc5 --- /dev/null +++ b/ld/testsuite/ld-plugin/lto-4r-d.d @@ -0,0 +1,7 @@ +#ld: -r --whole-archive tmpdir/liblto-4.a +#source: dummy.s +#objdump: -h + +#... +.* .gnu_object_only.* +#pass diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 81e72b42c15..0f87fbbb922 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -79,6 +79,15 @@ set lto_link_tests [list \ [list "Build liblto-3.a" \ "" "-flto $lto_fat" \ {lto-3b.c} {} "liblto-3.a"] \ + [list "Compile 4a" \ + "" "-flto $lto_fat" \ + {lto-4a.c} {} ""] \ + [list "Compile 4b" \ + "" "-O2" \ + {lto-4b.c} {} ""] \ + [list "Compile 4c" \ + "" "-O2" \ + {lto-4c.c} {} ""] \ [list "Compile 5a" \ "" "-flto $lto_fat" \ {lto-5a.c} {} ""] \ @@ -94,6 +103,12 @@ set lto_link_tests [list \ [list "Compile 9" \ "" "-O2 -finline -flto" \ {lto-9.cc} {} "" "c++"] \ + [list "Compile 10a" \ + "" "-O2" \ + {lto-10a.c} {} ""] \ + [list "Compile 10b" \ + "" "-O2 -flto $lto_fat" \ + {lto-10b.c} {} ""] \ [list "Compile 11a" \ "" "-O -flto" \ {lto-11a.c} {} ""] \ @@ -291,9 +306,21 @@ set lto_run_tests [list \ [list "LTO 3c" \ "-O2 -flto -fuse-linker-plugin tmpdir/lto-3a.o tmpdir/lto-3c.o -Wl,--whole-archive tmpdir/liblto-3.a -Wl,--no-whole-archive tmpdir/liblto-3.a" "" \ {dummy.c} "lto-3d.exe" "lto-3.out" "" "c"] \ + [list "LTO 4a" \ + "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-a.o" "" \ + {dummy.c} "lto-4a.exe" "lto-4.out" "" "c"] \ + [list "LTO 4c" \ + "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-c.o" "" \ + {dummy.c} "lto-4c.exe" "lto-4.out" "" "c"] \ + [list "LTO 4d" \ + "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-d.o" "" \ + {dummy.c} "lto-4d.exe" "lto-4.out" "" "c"] \ [list "LTO 5" \ "-O2 -flto -fuse-linker-plugin tmpdir/lto-5.o" "" \ {dummy.c} "lto-5.exe" "lto-5.out" "" "c"] \ + [list "LTO 10" \ + "-O2 -flto -fuse-linker-plugin tmpdir/lto-10.o" "" \ + {dummy.c} "lto-10.exe" "lto-10.out" "" "c"] \ [list "LTO 11" \ "-O -flto -fuse-linker-plugin tmpdir/liblto-11.a" "" \ {dummy.c} "lto-11.exe" "lto-11.out" "" "c"] \ @@ -378,6 +405,15 @@ if { [is_elf_format] && [check_lto_shared_available] } { } } +set testname "Build liblto-4.a" +remote_file host delete "tmpdir/liblto-4.a" +set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-4.a tmpdir/lto-4a.o tmpdir/lto-4b.o tmpdir/lto-4c.o"] +if {![string match "" $catch_output]} { + unresolved $testname + restore_notify + return +} + set testname "Build liblto-11.a" remote_file host delete "tmpdir/liblto-11.a" set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] @@ -419,8 +455,18 @@ if { [at_least_gcc_version 4 7] } { # Run "ld -r" to generate inputs for complex LTO tests. run_dump_test "lto-3r" remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o" +run_dump_test "lto-4r-a" +remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-a.o" +run_dump_test "lto-4r-b" +remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-b.o" +run_dump_test "lto-4r-c" +remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-c.o" +run_dump_test "lto-4r-d" +remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-d.o" run_dump_test "lto-5r" remote_exec host "mv" "tmpdir/dump tmpdir/lto-5.o" +run_dump_test "lto-10r" +remote_exec host "mv" "tmpdir/dump tmpdir/lto-10.o" run_cc_link_tests $lto_link_symbol_tests |