X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Falphaelf.em;h=0e2416cd69f97e68d1501627914e86e4295e4834;hb=f38a2680c2f04db6eac4fd87380cd3cf7bcb3bcc;hp=1301c6f004390b5e53ef3394ed0cc362a6aacf37;hpb=0e1862bb401f47716446aef143b2bf7a4563f541;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
index 1301c6f004..0e2416cd69 100644
--- a/ld/emultempl/alphaelf.em
+++ b/ld/emultempl/alphaelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -19,7 +19,7 @@
 # MA 02110-1301, USA.
 #
 
-# This file is sourced from elf32.em, and defines extra alpha
+# This file is sourced from elf.em, and defines extra alpha
 # specific routines.
 #
 fragment <<EOF
@@ -28,9 +28,9 @@ fragment <<EOF
 #include "elf/alpha.h"
 #include "elf-bfd.h"
 
-static bfd_boolean limit_32bit;
+static bool limit_32bit;
 
-extern bfd_boolean elf64_alpha_use_secureplt;
+extern bool elf64_alpha_use_secureplt;
 
 
 /* Set the start address as in the Tru64 ld.  */
@@ -47,7 +47,7 @@ alpha_after_open (void)
       lang_output_section_statement_type *plt_os[2];
 
       num_plt = 0;
-      for (os = &lang_output_section_statement.head->output_section_statement;
+      for (os = (void *) lang_os_list.head;
 	   os != NULL;
 	   os = os->next)
 	{
@@ -82,7 +82,7 @@ alpha_after_parse (void)
 				   exp_nameop (SIZEOF_HEADERS, NULL)),
 			NULL);
 
-  after_parse_default ();
+  ldelf_after_parse ();
 }
 
 static void
@@ -126,10 +126,11 @@ PARSE_AND_LIST_LONGOPTS='
 PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("\
   --taso                      Load executable in the lower 31-bit addressable\n\
-                                virtual address range.\n\
-  --secureplt                 Force PLT in text segment.\n\
-  --no-secureplt              Force PLT in data segment.\n\
-"));
+                                virtual address range\n"));
+  fprintf (file, _("\
+  --secureplt                 Force PLT in text segment\n"));
+  fprintf (file, _("\
+  --no-secureplt              Force PLT in data segment\n"));
 '
 
 PARSE_AND_LIST_ARGS_CASES='
@@ -137,10 +138,10 @@ PARSE_AND_LIST_ARGS_CASES='
       limit_32bit = 1;
       break;
     case OPTION_SECUREPLT:
-      elf64_alpha_use_secureplt = TRUE;
+      elf64_alpha_use_secureplt = true;
       break;
     case OPTION_NO_SECUREPLT:
-      elf64_alpha_use_secureplt = FALSE;
+      elf64_alpha_use_secureplt = false;
       break;
 '