sim: headers: use abs_srcdir to find helper scripts

[deliverable/binutils-gdb.git] / ld / emultempl / alphaelf.em

diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
index a2f460f14ae3bbd610f62271c41549c7ab10d665..21064ad8fb87885a9ed98adac098c1609389ddb9 100644 (file)
--- a/ld/emultempl/alphaelf.em
+++ b/ld/emultempl/alphaelf.em
@@ -1,5 +1,6 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright 2003, 2004, 2005, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -29,7 +30,6 @@ fragment <<EOF
 #include "elf-bfd.h"
 
 static bfd_boolean limit_32bit;
-static bfd_boolean disable_relaxation;
 
 extern bfd_boolean elf64_alpha_use_secureplt;
 
@@ -41,7 +41,7 @@ static void
 alpha_after_open (void)
 {
   if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
-      && elf_object_id (link_info.output_bfd) == ALPHA_ELF_TDATA)
+      && elf_object_id (link_info.output_bfd) == ALPHA_ELF_DATA)
     {
       unsigned int num_plt;
       lang_output_section_statement_type *os;
@@ -79,6 +79,8 @@ alpha_after_parse (void)
                                   exp_intop (ALPHA_TEXT_START_32BIT),
                                   exp_nameop (SIZEOF_HEADERS, NULL)),
                        NULL);
+
+  after_parse_default ();
 }
 
 static void
@@ -88,8 +90,8 @@ alpha_before_allocation (void)
   gld${EMULATION_NAME}_before_allocation ();
 
   /* Add -relax if -O, not -r, and not explicitly disabled.  */
-  if (link_info.optimize && !link_info.relocatable && !disable_relaxation)
-    command_line.relax = TRUE;
+  if (link_info.optimize && !link_info.relocatable && ! RELAXATION_DISABLED_BY_USER)
+    ENABLE_RELAXATION;
 }
 
 static void
@@ -107,14 +109,12 @@ EOF
 #
 PARSE_AND_LIST_PROLOGUE='
 #define OPTION_TASO            300
-#define OPTION_NO_RELAX                (OPTION_TASO + 1)
-#define OPTION_SECUREPLT       (OPTION_NO_RELAX + 1)
+#define OPTION_SECUREPLT       (OPTION_TASO + 1)
 #define OPTION_NO_SECUREPLT    (OPTION_SECUREPLT + 1)
 '
 
 PARSE_AND_LIST_LONGOPTS='
   { "taso", no_argument, NULL, OPTION_TASO },
-  { "no-relax", no_argument, NULL, OPTION_NO_RELAX },
   { "secureplt", no_argument, NULL, OPTION_SECUREPLT },
   { "no-secureplt", no_argument, NULL, OPTION_NO_SECUREPLT },
 '
@@ -123,7 +123,6 @@ PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("\
   --taso                      Load executable in the lower 31-bit addressable\n\
                                 virtual address range.\n\
-  --no-relax                  Do not relax call and gp sequences.\n\
   --secureplt                 Force PLT in text segment.\n\
   --no-secureplt              Force PLT in data segment.\n\
 "));
@@ -133,9 +132,6 @@ PARSE_AND_LIST_ARGS_CASES='
     case OPTION_TASO:
       limit_32bit = 1;
       break;
-    case OPTION_NO_RELAX:
-      disable_relaxation = TRUE;
-      break;
     case OPTION_SECUREPLT:
       elf64_alpha_use_secureplt = TRUE;
       break;