diff options
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/emulparams/elf64alpha.sh | 52 | ||||
| -rw-r--r-- | ld/emultempl/alphaelf.em | 83 |
3 files changed, 92 insertions, 51 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 73746d6..7360588 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2003-03-03 Alan Modra <amodra@bigpond.net.au> + + * emulparams/elf64alpha.sh (EXTRA_EM_FILE): Define. + (PARSE_AND_LIST_PROLOGUE, PARSE_AND_LIST_LONGOPTS, + PARSE_AND_LIST_OPTIONS, PARSE_AND_LIST_ARGS_CASES, + PARSE_AND_LIST_EPILOGUE): Don't define. + * emultempl/alphaelf.em: New file. + 2003-03-01 Alan Modra <amodra@bigpond.net.au> * ldemul.c: Include getopt.h. diff --git a/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh index 3dd28ef..2d16e9c 100644 --- a/ld/emulparams/elf64alpha.sh +++ b/ld/emulparams/elf64alpha.sh @@ -2,6 +2,7 @@ ENTRY=_start SCRIPT_NAME=elf ELFSIZE=64 TEMPLATE_NAME=elf32 +EXTRA_EM_FILE=alphaelf OUTPUT_FORMAT="elf64-alpha" TEXT_START_ADDR="0x120000000" MAXPAGESIZE=0x10000 @@ -17,54 +18,3 @@ NOP=0x0000fe2f1f04ff47 # unop; nop OTHER_READONLY_SECTIONS=" .reginfo ${RELOCATING-0} : { *(.reginfo) }" - -# This code gets inserted into the generic elf32.sc linker script -# and allows us to define our own command line switches. -PARSE_AND_LIST_PROLOGUE=' -#define OPTION_TASO 300 -/* Set the start address as in the Tru64 ld */ -#define ALPHA_TEXT_START_32BIT 0x12000000 - -static int elf64alpha_32bit = 0; - -struct ld_emulation_xfer_struct ld_elf64alpha_emulation; -static void gld_elf64alpha_finish PARAMS ((void)); -' - -PARSE_AND_LIST_LONGOPTS=' - {"taso", no_argument, NULL, OPTION_TASO}, -' - -PARSE_AND_LIST_OPTIONS=' - fprintf (file, _(" -taso\t\t\tLoad executable in the lower 31-bit addressable\n")); - fprintf (file, _("\t\t\t virtual address range\n")); -' - -PARSE_AND_LIST_ARGS_CASES=' - case EOF: - if (elf64alpha_32bit && !link_info.shared && !link_info.relocateable) - { - lang_section_start (".interp", - exp_binop ('\''+'\'', - exp_intop (ALPHA_TEXT_START_32BIT), - exp_nameop (SIZEOF_HEADERS, NULL))); - ld_elf64alpha_emulation.finish = gld_elf64alpha_finish; - } - return 0; - - case OPTION_TASO: - elf64alpha_32bit = 1; - break; -' - -PARSE_AND_LIST_EPILOGUE=' -#include "elf/internal.h" -#include "elf/alpha.h" -#include "elf-bfd.h" - -static void -gld_elf64alpha_finish() -{ - elf_elfheader (output_bfd)->e_flags |= EF_ALPHA_32BIT; -} -' diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em new file mode 100644 index 0000000..4ff83cb --- /dev/null +++ b/ld/emultempl/alphaelf.em @@ -0,0 +1,83 @@ +# This shell script emits a C file. -*- C -*- +# Copyright 2003 Free Software Foundation, Inc. +# +# This file is part of GLD, the Gnu Linker. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +# This file is sourced from elf32.em, and defines extra alpha +# specific routines. +# +cat >>e${EMULATION_NAME}.c <<EOF + +#include "elf/internal.h" +#include "elf/alpha.h" +#include "elf-bfd.h" + +static void alpha_after_parse PARAMS ((void)); +static void alpha_finish PARAMS ((void)); + +static int elf64alpha_32bit = 0; + +/* Set the start address as in the Tru64 ld. */ +#define ALPHA_TEXT_START_32BIT 0x12000000 + +static void +alpha_after_parse () +{ + if (elf64alpha_32bit && !link_info.shared && !link_info.relocateable) + lang_section_start (".interp", + exp_binop ('+', + exp_intop (ALPHA_TEXT_START_32BIT), + exp_nameop (SIZEOF_HEADERS, NULL))); +} + +static void +alpha_finish () +{ + if (elf64alpha_32bit) + elf_elfheader (output_bfd)->e_flags |= EF_ALPHA_32BIT; + + gld${EMULATION_NAME}_finish (); +} +EOF + +# Define some shell vars to insert bits of code into the standard elf +# parse_args and list_options functions. +# +PARSE_AND_LIST_PROLOGUE=' +#define OPTION_TASO 300 +' + +PARSE_AND_LIST_LONGOPTS=' + {"taso", no_argument, NULL, OPTION_TASO}, +' + +PARSE_AND_LIST_OPTIONS=' + fprintf (file, _(" -taso\t\t\tLoad executable in the lower 31-bit addressable\n")); + fprintf (file, _("\t\t\t virtual address range\n")); +' + +PARSE_AND_LIST_ARGS_CASES=' + case OPTION_TASO: + elf64alpha_32bit = 1; + break; +' + +# Put these extra alpha routines in ld_${EMULATION_NAME}_emulation +# +LDEMUL_AFTER_PARSE=alpha_after_parse +LDEMUL_FINISH=alpha_finish |