X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fbeos.em;h=4da5eeef6d2376eb93269ce243d1dbecf9382660;hb=607b483327fdfc75fb193870b3c4e7445ce3f64d;hp=619e69222137b25000878b13d134bd983d63b7e8;hpb=0c7a8e5acd399d1d36dbe0cda815844dd5308c10;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em index 619e692221..4da5eeef6d 100644 --- a/ld/emultempl/beos.em +++ b/ld/emultempl/beos.em @@ -5,24 +5,27 @@ if [ -z "$MACHINE" ]; then else OUTPUT_ARCH=${ARCH}:${MACHINE} fi -cat >e${EMULATION_NAME}.c <arch; - ldfile_output_machine = arch->mach; - ldfile_output_machine_name = arch->printable_name; - } - else - ldfile_output_architecture = bfd_arch_${ARCH}; + ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`); output_filename = "a.exe"; } @@ -85,8 +82,8 @@ gld_${EMULATION_NAME}_before_parse (void) #define OPTION_MINOR_OS_VERSION (OPTION_MINOR_IMAGE_VERSION + 1) #define OPTION_MINOR_SUBSYSTEM_VERSION (OPTION_MINOR_OS_VERSION + 1) #define OPTION_SECTION_ALIGNMENT (OPTION_MINOR_SUBSYSTEM_VERSION + 1) -#define OPTION_STACK (OPTION_SECTION_ALIGNMENT + 1) -#define OPTION_SUBSYSTEM (OPTION_STACK + 1) +#define OPTION_STACK (OPTION_SECTION_ALIGNMENT + 1) +#define OPTION_SUBSYSTEM (OPTION_STACK + 1) #define OPTION_HEAP (OPTION_SUBSYSTEM + 1) static void @@ -195,10 +192,6 @@ set_pe_subsystem (void) { "wwindows", 2, "_wWinMainCRTStartup" }, { "console", 3, "_mainCRTStartup" }, { "wconsole", 3, "_wmainCRTStartup" }, -#if 0 - /* The Microsoft linker does not recognize this. */ - { "os2", 5, "" }, -#endif { "posix", 7, "___PosixProcessStartup"}, { 0, 0, 0 } }; @@ -217,7 +210,7 @@ set_pe_subsystem (void) set_pe_name ("__minor_subsystem_version__", strtoul (end + 1, &end, 0)); if (*end != '\0') - einfo ("%P: warning: bad version number in -subsystem option\n"); + einfo (_("%P: warning: bad version number in -subsystem option\n")); } for (i = 0; v[i].name; i++) @@ -228,28 +221,13 @@ set_pe_subsystem (void) set_pe_name ("__subsystem__", v[i].value); /* If the subsystem is windows, we use a different entry - point. We also register the entry point as an undefined - symbol. from lang_add_entry() The reason we do - this is so that the user - doesn't have to because they would have to use the -u - switch if they were specifying an entry point other than - _mainCRTStartup. Specifically, if creating a windows - application, entry point _WinMainCRTStartup must be - specified. What I have found for non console - applications (entry not _mainCRTStartup) is that the .obj - that contains mainCRTStartup is brought in since it is - the first encountered in libc.lib and it has other - symbols in it which will be pulled in by the link - process. To avoid this, adding -u with the entry point - name specified forces the correct .obj to be used. We - can avoid making the user do this by always adding the - entry point name as an undefined symbol. */ - lang_add_entry (v[i].entry, 1); + point. */ + lang_default_entry (v[i].entry); return; } } - einfo ("%P%F: invalid subsystem type %s\n", optarg); + einfo (_("%F%P: invalid subsystem type %s\n"), optarg); } @@ -260,7 +238,7 @@ set_pe_value (char *name) set_pe_name (name, strtoul (optarg, &end, 0)); if (end == optarg) { - einfo ("%P%F: invalid hex number for PE parameter '%s'\n", optarg); + einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg); } optarg = end; @@ -277,7 +255,7 @@ set_pe_stack_heap (char *resname, char *comname) } else if (*optarg) { - einfo ("%P%F: strange hex info for PE parameter '%s'\n", optarg); + einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg); } } @@ -293,11 +271,7 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_BASE_FILE: link_info.base_file = fopen (optarg, FOPEN_WB); if (link_info.base_file == NULL) - { - fprintf (stderr, "%s: Can't open base file %s\n", - program_name, optarg); - xexit (1); - } + einfo (_("%F%P: cannot open base file %s\n"), optarg); break; /* PE options */ @@ -353,11 +327,10 @@ gld_${EMULATION_NAME}_set_symbols (void) /* Run through and invent symbols for all the names and insert the defaults. */ int j; - lang_statement_list_type *save; if (!init[IMAGEBASEOFF].inited) { - if (link_info.relocatable) + if (bfd_link_relocatable (&link_info)) init[IMAGEBASEOFF].value = 0; else if (init[DLLOFF].value) init[IMAGEBASEOFF].value = BEOS_DLL_IMAGE_BASE; @@ -366,18 +339,17 @@ gld_${EMULATION_NAME}_set_symbols (void) } /* Don't do any symbol assignments if this is a relocatable link. */ - if (link_info.relocatable) + if (bfd_link_relocatable (&link_info)) return; /* Glue the assignments into the abs section */ - save = stat_ptr; - - stat_ptr = &(abs_output_section->children); + push_stat_ptr (&abs_output_section->children); for (j = 0; init[j].ptr; j++) { long val = init[j].value; - lang_add_assignment (exp_assop ('=', init[j].symbol, exp_intop (val))); + lang_add_assignment (exp_assign (init[j].symbol, exp_intop (val), + FALSE)); if (init[j].size == sizeof(short)) *(short *)init[j].ptr = val; else if (init[j].size == sizeof(int)) @@ -390,28 +362,30 @@ gld_${EMULATION_NAME}_set_symbols (void) else abort(); } /* Restore the pointer. */ - stat_ptr = save; + pop_stat_ptr (); if (pe.FileAlignment > pe.SectionAlignment) { - einfo ("%P: warning, file alignment > section alignment.\n"); + einfo (_("%P: warning, file alignment > section alignment\n")); } } static void gld_${EMULATION_NAME}_after_open (void) { + after_open_default (); + /* Pass the wacky PE command line options into the output bfd. FIXME: This should be done via a function, rather than by including an internal BFD header. */ - if (!coff_data(output_bfd)->pe) + if (!coff_data(link_info.output_bfd)->pe) { - einfo ("%F%P: PE operations on non PE file.\n"); + einfo (_("%F%P: PE operations on non PE file\n")); } - pe_data(output_bfd)->pe_opthdr = pe; - pe_data(output_bfd)->dll = init[DLLOFF].value; + pe_data(link_info.output_bfd)->pe_opthdr = pe; + pe_data(link_info.output_bfd)->dll = init[DLLOFF].value; } @@ -420,17 +394,19 @@ gld_${EMULATION_NAME}_after_open (void) static int sort_by_file_name (const void *a, const void *b) { - const lang_statement_union_type *const *ra = a; - const lang_statement_union_type *const *rb = b; + const lang_input_section_type *const *ra = a; + const lang_input_section_type *const *rb = b; + asection *sa = (*ra)->section; + asection *sb = (*rb)->section; int i, a_sec, b_sec; - i = strcmp ((*ra)->input_section.ifile->the_bfd->my_archive->filename, - (*rb)->input_section.ifile->the_bfd->my_archive->filename); + i = filename_cmp (bfd_get_filename (sa->owner->my_archive), + bfd_get_filename (sb->owner->my_archive)); if (i != 0) return i; - i = strcmp ((*ra)->input_section.ifile->filename, - (*rb)->input_section.ifile->filename); + i = filename_cmp (bfd_get_filename (sa->owner), + bfd_get_filename (sb->owner)); if (i != 0) return i; /* the tail idata4/5 are the only ones without relocs to an @@ -439,56 +415,55 @@ sort_by_file_name (const void *a, const void *b) and HNT properly. if no reloc this one is import by ordinal so we have to sort by section contents */ - if ( ((*ra)->input_section.section->reloc_count + (*rb)->input_section.section->reloc_count) ) + if (sa->reloc_count + sb->reloc_count != 0) { - i = (((*ra)->input_section.section->reloc_count > - (*rb)->input_section.section->reloc_count) ? -1 : 0); - if ( i != 0) - return i; + i = sa->reloc_count > sb->reloc_count ? -1 : 0; + if (i != 0) + return i; - return (((*ra)->input_section.section->reloc_count > - (*rb)->input_section.section->reloc_count) ? 0 : 1); + return sa->reloc_count > sb->reloc_count ? 0 : 1; } else { - if ( (strcmp( (*ra)->input_section.section->name, ".idata$6") == 0) ) - return 0; /* don't sort .idata$6 or .idata$7 FIXME dlltool eliminate .idata$7 */ - - if (! bfd_get_section_contents ((*ra)->input_section.ifile->the_bfd, - (*ra)->input_section.section, &a_sec, (file_ptr) 0, (bfd_size_type)sizeof(a_sec))) - einfo ("%F%B: Can't read contents of section .idata: %E\n", - (*ra)->input_section.ifile->the_bfd); - - if (! bfd_get_section_contents ((*rb)->input_section.ifile->the_bfd, - (*rb)->input_section.section, &b_sec, (file_ptr) 0, (bfd_size_type)sizeof(b_sec) )) - einfo ("%F%B: Can't read contents of section .idata: %E\n", - (*rb)->input_section.ifile->the_bfd); - - i = ((a_sec < b_sec) ? -1 : 0); - if ( i != 0) - return i; - return ((a_sec < b_sec) ? 0 : 1); - } -return 0; + /* don't sort .idata$6 or .idata$7 FIXME dlltool eliminate .idata$7 */ + if ((strcmp (sa->name, ".idata$6") == 0)) + return 0; + + if (!bfd_get_section_contents (sa->owner, sa, &a_sec, (file_ptr) 0, + (bfd_size_type) sizeof (a_sec))) + einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"), + sa->owner); + + if (!bfd_get_section_contents (sb->owner, sb, &b_sec, (file_ptr) 0, + (bfd_size_type) sizeof (b_sec))) + einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"), + sb->owner); + + i = a_sec < b_sec ? -1 : 0; + if (i != 0) + return i; + return a_sec < b_sec ? 0 : 1; + } + return 0; } static int sort_by_section_name (const void *a, const void *b) { - const lang_statement_union_type *const *ra = a; - const lang_statement_union_type *const *rb = b; + const lang_input_section_type *const *ra = a; + const lang_input_section_type *const *rb = b; + const char *sna = (*ra)->section->name; + const char *snb = (*rb)->section->name; int i; - i = strcmp ((*ra)->input_section.section->name, - (*rb)->input_section.section->name); -/* this is a hack to make .stab and .stabstr last, so we don't have - to fix strip/objcopy for .reloc sections. - FIXME stripping images with a .rsrc section still needs to be fixed */ - if ( i != 0) + i = strcmp (sna, snb); + /* This is a hack to make .stab and .stabstr last, so we don't have + to fix strip/objcopy for .reloc sections. + FIXME stripping images with a .rsrc section still needs to be fixed. */ + if (i != 0) { - if ((strncmp ((*ra)->input_section.section->name, ".stab", 5) == 0) - && (strncmp ((*rb)->input_section.section->name, ".stab", 5) != 0)) - return 1; - return i; + if ((CONST_STRNEQ (sna, ".stab")) + && (!CONST_STRNEQ (snb, ".stab"))) + return 1; } return i; } @@ -561,7 +536,7 @@ sort_sections (lang_statement_union_type *s) { /* Is this the .idata section? */ if (sec->spec.name != NULL - && strncmp (sec->spec.name, ".idata", 6) == 0) + && CONST_STRNEQ (sec->spec.name, ".idata")) { /* Sort the children. We want to sort any objects in the same archive. In order to handle the case of @@ -574,7 +549,7 @@ sort_sections (lang_statement_union_type *s) { lang_statement_union_type *start = *p; if (start->header.type != lang_input_section_enum - || !start->input_section.ifile->the_bfd->my_archive) + || !start->input_section.section->owner->my_archive) p = &(start->header.next); else { @@ -633,18 +608,17 @@ sort_sections (lang_statement_union_type *s) static void gld_${EMULATION_NAME}_before_allocation (void) { - extern lang_statement_list_type *stat_ptr; - #ifdef TARGET_IS_ppcpe /* Here we rummage through the found bfds to collect toc information */ { LANG_FOR_EACH_INPUT_STATEMENT (is) - { - if (!ppc_process_before_allocation(is->the_bfd, &link_info)) - { - einfo("Errors encountered processing file %s\n", is->filename); - } - } + { + if (!ppc_process_before_allocation(is->the_bfd, &link_info)) + { + einfo (_("%P: errors encountered processing file %s\n"), + is->filename); + } + } } /* We have seen it all. Allocate it, and carry on */ @@ -659,12 +633,13 @@ gld_${EMULATION_NAME}_before_allocation (void) option? krk@cygnus.com */ { LANG_FOR_EACH_INPUT_STATEMENT (is) - { - if (!arm_process_before_allocation (is->the_bfd, & link_info)) - { - einfo ("Errors encountered processing file %s", is->filename); - } - } + { + if (!arm_process_before_allocation (is->the_bfd, & link_info)) + { + einfo (_("%P: errors encountered processing file %s\n"), + is->filename); + } + } } /* We have seen it all. Allocate it, and carry on */ @@ -673,6 +648,8 @@ gld_${EMULATION_NAME}_before_allocation (void) #endif /* TARGET_IS_ppcpe */ sort_sections (stat_ptr->head); + + before_allocation_default (); } /* Place an orphan section. We use this to put sections with a '\$' in them @@ -686,33 +663,31 @@ gld_${EMULATION_NAME}_before_allocation (void) but I'm leaving this here in case we want to enable it for sections which are not mentioned in the linker script. */ -/*ARGSUSED*/ -static bfd_boolean -gld${EMULATION_NAME}_place_orphan (lang_input_statement_type *file, asection *s) +static lang_output_section_statement_type * +gld${EMULATION_NAME}_place_orphan (asection *s, + const char *secname, + int constraint) { - const char *secname; char *output_secname, *ps; lang_output_section_statement_type *os; lang_statement_union_type *l; if ((s->flags & SEC_ALLOC) == 0) - return FALSE; + return NULL; /* Don't process grouped sections unless doing a final link. If they're marked as COMDAT sections, we don't want .text\$foo to end up in .text and then have .text disappear because it's marked link-once-discard. */ - if (link_info.relocatable) - return FALSE; - - secname = bfd_get_section_name (s->owner, s); + if (bfd_link_relocatable (&link_info)) + return NULL; /* Everything from the '\$' on gets deleted so don't allow '\$' as the first character. */ if (*secname == '\$') - einfo ("%P%F: section %s has '\$' as first character\n", secname); + einfo (_("%F%P: section %s has '\$' as first character\n"), secname); if (strchr (secname + 1, '\$') == NULL) - return FALSE; + return NULL; /* Look up the output section. The Microsoft specs say sections names in image files never contain a '\$'. Fortunately, lang_..._lookup creates @@ -720,7 +695,7 @@ gld${EMULATION_NAME}_place_orphan (lang_input_statement_type *file, asection *s) output_secname = xstrdup (secname); ps = strchr (output_secname + 1, '\$'); *ps = 0; - os = lang_output_section_statement_lookup (output_secname); + os = lang_output_section_statement_lookup (output_secname, constraint, TRUE); /* Find the '\$' wild statement for this section. We currently require the linker script to explicitly mention "*(.foo\$)". @@ -742,38 +717,15 @@ gld${EMULATION_NAME}_place_orphan (lang_input_statement_type *file, asection *s) } ps[0] = 0; if (l == NULL) -#if 1 - einfo ("%P%F: *(%s\$) missing from linker script\n", output_secname); -#else /* FIXME: This block is untried. It exists to convey the intent, - should one decide to not require *(.foo\$) to appear in the linker - script. */ - { - lang_wild_statement_type *new; - struct wildcard_list *tmp; - - tmp = (struct wildcard_list *) xmalloc (sizeof *tmp); - tmp->next = NULL; - tmp->spec.name = xmalloc (strlen (output_secname) + 2); - sprintf (tmp->spec.name, "%s\$", output_secname); - tmp->spec.exclude_name_list = NULL; - tmp->sorted = FALSE; - new = new_stat (lang_wild_statement, &os->children); - new->filename = NULL; - new->filenames_sorted = FALSE; - new->section_list = tmp; - new->keep_sections = FALSE; - lang_list_init (&new->children); - l = new; - } -#endif + einfo (_("%F%P: *(%s\$) missing from linker script\n"), output_secname); /* Link the input section in and we're done for now. The sections still have to be sorted, but that has to wait until all such sections have been processed by us. The sorting is done by sort_sections. */ - lang_add_section (&l->wild_statement.children, s, os, file); + lang_add_section (&l->wild_statement.children, s, NULL, os); - return TRUE; + return os; } static char * @@ -783,15 +735,15 @@ EOF # sed commands to quote an ld script as a C string. sc="-f stringify.sed" -cat >>e${EMULATION_NAME}.c <> e${EMULATION_NAME}.c -echo ' ; else if (link_info.relocatable) return' >> e${EMULATION_NAME}.c +echo ' ; else if (bfd_link_relocatable (&link_info)) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xr >> e${EMULATION_NAME}.c echo ' ; else if (!config.text_read_only) return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.xbn >> e${EMULATION_NAME}.c @@ -801,7 +753,7 @@ echo ' ; else return' >> e${EMULATION_NAME}.c sed $sc ldscripts/${EMULATION_NAME}.x >> e${EMULATION_NAME}.c echo '; }' >> e${EMULATION_NAME}.c -cat >>e${EMULATION_NAME}.c <