X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Falphaelf.em;h=421219367cee2ef7653bcb4a46927daf6a0e9dfb;hb=29063f8bfb9d68a213efd1d0ab7a66f97ed9a013;hp=1bee6f90e7131d208fc6031d895621fceb387805;hpb=aa820537ead0135a7c38c619039dce8a6fc74ed1;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
index 1bee6f90e7..421219367c 100644
--- a/ld/emultempl/alphaelf.em
+++ b/ld/emultempl/alphaelf.em
@@ -1,6 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2003, 2004, 2005, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright (C) 2003-2016 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -30,7 +29,6 @@ fragment <<EOF
 #include "elf-bfd.h"
 
 static bfd_boolean limit_32bit;
-static bfd_boolean disable_relaxation;
 
 extern bfd_boolean elf64_alpha_use_secureplt;
 
@@ -42,7 +40,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;
@@ -74,12 +72,17 @@ alpha_after_open (void)
 static void
 alpha_after_parse (void)
 {
-  if (limit_32bit && !link_info.shared && !link_info.relocatable)
+  link_info.relax_pass = 2;
+  if (limit_32bit
+      && !bfd_link_pic (&link_info)
+      && !bfd_link_relocatable (&link_info))
     lang_section_start (".interp",
 			exp_binop ('+',
 				   exp_intop (ALPHA_TEXT_START_32BIT),
 				   exp_nameop (SIZEOF_HEADERS, NULL)),
 			NULL);
+
+  gld${EMULATION_NAME}_after_parse ();
 }
 
 static void
@@ -89,8 +92,10 @@ 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
+      && !bfd_link_relocatable (&link_info)
+      && ! RELAXATION_DISABLED_BY_USER)
+    ENABLE_RELAXATION;
 }
 
 static void
@@ -108,14 +113,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 },
 '
@@ -124,7 +127,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\
 "));
@@ -134,9 +136,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;