X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Favrelf.em;h=3c897cb8047c11d17064dea3bc51504eb797d834;hb=739b5c9c778dee9e2f54d864f83a81ecb0639535;hp=f0807ddea392733fb427a9b9f89b4e26e0510b0d;hpb=aa820537ead0135a7c38c619039dce8a6fc74ed1;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em index f0807ddea3..3c897cb804 100644 --- a/ld/emultempl/avrelf.em +++ b/ld/emultempl/avrelf.em @@ -1,6 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 2006-2019 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -29,6 +28,7 @@ fragment <the_bfd, - avr_stub_section, - avr_no_stubs, - avr_debug_stubs, - avr_debug_relax, - avr_pc_wrap_around, - avr_replace_call_ret_sequences); + stub_file->the_bfd, + avr_stub_section, + avr_no_stubs, + avr_debug_stubs, + avr_debug_relax, + avr_pc_wrap_around, + avr_replace_call_ret_sequences); } @@ -71,15 +71,23 @@ avr_elf_${EMULATION_NAME}_before_allocation (void) gld${EMULATION_NAME}_before_allocation (); - /* We only need stubs for the avr6 family. */ - if (strcmp ("${EMULATION_NAME}","avr6")) + if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour) + { + avr_no_stubs = TRUE; + return; + } + + /* We only need stubs for avr6, avrxmega6, and avrxmega7. */ + if (strcmp ("${EMULATION_NAME}","avr6") + && strcmp ("${EMULATION_NAME}","avrxmega6") + && strcmp ("${EMULATION_NAME}","avrxmega7") ) avr_no_stubs = TRUE; avr_elf_set_global_bfd_parameters (); /* If generating a relocatable output file, then we don't have to generate the trampolines. */ - if (link_info.relocatable) + if (bfd_link_relocatable (&link_info)) avr_no_stubs = TRUE; if (avr_no_stubs) @@ -88,14 +96,14 @@ avr_elf_${EMULATION_NAME}_before_allocation (void) ret = elf32_avr_setup_section_lists (link_info.output_bfd, &link_info); if (ret < 0) - einfo ("%X%P: can not setup the input section list: %E\n"); + einfo (_("%X%P: can not setup the input section list: %E\n")); if (ret <= 0) return; /* Call into the BFD backend to do the real "stub"-work. */ if (! elf32_avr_size_stubs (link_info.output_bfd, &link_info, TRUE)) - einfo ("%X%P: can not size stub section: %E\n"); + einfo (_("%X%P: can not size stub section: %E\n")); } /* This is called before the input files are opened. We create a new @@ -106,24 +114,31 @@ avr_elf_create_output_section_statements (void) { flagword flags; + if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour) + { + einfo (_("%F%P: error: cannot change output format " + "whilst linking %s binaries\n"), "AVR"); + return; + } + stub_file = lang_add_input_file ("linker stubs", - lang_input_file_is_fake_enum, - NULL); + lang_input_file_is_fake_enum, + NULL); stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd); if (stub_file->the_bfd == NULL || !bfd_set_arch_mach (stub_file->the_bfd, - bfd_get_arch (link_info.output_bfd), - bfd_get_mach (link_info.output_bfd))) + bfd_get_arch (link_info.output_bfd), + bfd_get_mach (link_info.output_bfd))) { - einfo ("%X%P: can not create stub BFD %E\n"); + einfo (_("%X%P: can not create stub BFD: %E\n")); return; } /* Now we add the stub section. */ flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE - | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); + | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); avr_stub_section = bfd_make_section_anyway_with_flags (stub_file->the_bfd, ".trampolines", flags); @@ -136,9 +151,9 @@ avr_elf_create_output_section_statements (void) return; - err_ret: - einfo ("%X%P: can not make stub section: %E\n"); - return; + err_ret: + einfo (_("%X%P: can not make stub section: %E\n")); + return; } /* Re-calculates the size of the stubs so that we won't waste space. */ @@ -146,12 +161,12 @@ avr_elf_create_output_section_statements (void) static void avr_elf_after_allocation (void) { - if (!avr_no_stubs && !command_line.relax) + if (!avr_no_stubs && ! RELAXATION_ENABLED) { /* If relaxing, elf32_avr_size_stubs will be called from elf32_avr_relax_section. */ - if (!elf32_avr_size_stubs (link_info.output_bfd, &link_info, FALSE)) - einfo ("%X%P: can not size stub section: %E\n"); + if (!elf32_avr_size_stubs (link_info.output_bfd, &link_info, TRUE)) + einfo (_("%X%P: can not size stub section: %E\n")); } gld${EMULATION_NAME}_after_allocation (); @@ -160,26 +175,74 @@ avr_elf_after_allocation (void) if (!avr_no_stubs) { if (!elf32_avr_build_stubs (&link_info)) - einfo ("%X%P: can not build stubs: %E\n"); + einfo (_("%X%P: can not build stubs: %E\n")); } } +static void +avr_elf_before_parse (void) +{ + /* Don't create a demand-paged executable, since this feature isn't + meaningful in AVR. */ + config.magic_demand_paged = FALSE; + + gld${EMULATION_NAME}_before_parse (); +} +static void +avr_finish (void) +{ + bfd *abfd; + bfd_boolean avr_link_relax; + + if (bfd_link_relocatable (&link_info)) + { + avr_link_relax = TRUE; + for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next) + { + /* Don't let the linker stubs prevent the final object being + marked as link-relax ready. */ + if ((elf_elfheader (abfd)->e_flags + & EF_AVR_LINKRELAX_PREPARED) == 0 + && abfd != stub_file->the_bfd) + { + avr_link_relax = FALSE; + break; + } + } + } + else + { + avr_link_relax = RELAXATION_ENABLED; + } + + abfd = link_info.output_bfd; + + if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour) + { + if (avr_link_relax) + elf_elfheader (abfd)->e_flags |= EF_AVR_LINKRELAX_PREPARED; + else + elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED; + } + + finish_default (); +} EOF PARSE_AND_LIST_PROLOGUE=' #define OPTION_NO_CALL_RET_REPLACEMENT 301 -#define OPTION_PMEM_WRAP_AROUND 302 -#define OPTION_NO_STUBS 303 -#define OPTION_DEBUG_STUBS 304 -#define OPTION_DEBUG_RELAX 305 +#define OPTION_PMEM_WRAP_AROUND 302 +#define OPTION_NO_STUBS 303 +#define OPTION_DEBUG_STUBS 304 +#define OPTION_DEBUG_RELAX 305 ' PARSE_AND_LIST_LONGOPTS=' { "no-call-ret-replacement", no_argument, - NULL, OPTION_NO_CALL_RET_REPLACEMENT}, + NULL, OPTION_NO_CALL_RET_REPLACEMENT}, { "pmem-wrap-around", required_argument, NULL, OPTION_PMEM_WRAP_AROUND}, { "no-stubs", no_argument, @@ -194,7 +257,7 @@ PARSE_AND_LIST_OPTIONS=' fprintf (file, _(" --pmem-wrap-around= " "Make the linker relaxation machine assume that a\n" " " - " program counter wrap-around occures at address\n" + " program counter wrap-around occurs at address\n" " " " . Supported values: 8k, 16k, 32k and 64k.\n")); fprintf (file, _(" --no-call-ret-replacement " @@ -223,17 +286,17 @@ PARSE_AND_LIST_ARGS_CASES=' case OPTION_PMEM_WRAP_AROUND: { - /* This variable is defined in the bfd library. */ - if ((!strcmp (optarg,"32k")) || (!strcmp (optarg,"32K"))) - avr_pc_wrap_around = 32768; - else if ((!strcmp (optarg,"8k")) || (!strcmp (optarg,"8K"))) - avr_pc_wrap_around = 8192; - else if ((!strcmp (optarg,"16k")) || (!strcmp (optarg,"16K"))) - avr_pc_wrap_around = 16384; - else if ((!strcmp (optarg,"64k")) || (!strcmp (optarg,"64K"))) - avr_pc_wrap_around = 0x10000; - else - return FALSE; + /* This variable is defined in the bfd library. */ + if ((!strcmp (optarg,"32k")) || (!strcmp (optarg,"32K"))) + avr_pc_wrap_around = 32768; + else if ((!strcmp (optarg,"8k")) || (!strcmp (optarg,"8K"))) + avr_pc_wrap_around = 8192; + else if ((!strcmp (optarg,"16k")) || (!strcmp (optarg,"16K"))) + avr_pc_wrap_around = 16384; + else if ((!strcmp (optarg,"64k")) || (!strcmp (optarg,"64K"))) + avr_pc_wrap_around = 0x10000; + else + return FALSE; } break; @@ -251,8 +314,8 @@ PARSE_AND_LIST_ARGS_CASES=' case OPTION_NO_CALL_RET_REPLACEMENT: { - /* This variable is defined in the bfd library. */ - avr_replace_call_ret_sequences = FALSE; + /* This variable is defined in the bfd library. */ + avr_replace_call_ret_sequences = FALSE; } break; ' @@ -260,6 +323,8 @@ PARSE_AND_LIST_ARGS_CASES=' # # Put these extra avr-elf routines in ld_${EMULATION_NAME}_emulation # +LDEMUL_BEFORE_PARSE=avr_elf_before_parse LDEMUL_BEFORE_ALLOCATION=avr_elf_${EMULATION_NAME}_before_allocation LDEMUL_AFTER_ALLOCATION=avr_elf_after_allocation LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=avr_elf_create_output_section_statements +LDEMUL_FINISH=avr_finish