Re: PATCH: Fix ld -taso

[Alan Modra <amodra at bigpond dot net dot au>]

On Fri, Feb 28, 2003 at 10:33:34PM -0800, H. J. Lu wrote:
> When ld -taso is used, should gldelf64alpha_finish () be called?

Undoubtedly.  I think it would be even nicer if alpha did its
text start fudge in an after_parse function, and provided a finish
function that was always called.  Perhaps the abuse of PARSE_AND_LIST*
occured before better alternatives were generally available.

	* 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.

OK Richard?

Index: ld/emulparams/elf64alpha.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf64alpha.sh,v
retrieving revision 1.10
diff -u -p -r1.10 elf64alpha.sh
--- ld/emulparams/elf64alpha.sh	15 Feb 2002 23:39:27 -0000	1.10
+++ ld/emulparams/elf64alpha.sh	1 Mar 2003 11:45:20 -0000
@@ -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;
-}
-'
Index: ld/emultempl/alphaelf.em
===================================================================
RCS file: ld/emultempl/alphaelf.em
diff -N ld/emultempl/alphaelf.em
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ld/emultempl/alphaelf.em	1 Mar 2003 11:45:20 -0000
@@ -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

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre