Merge from gcc:

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

diff --git a/ld/emultempl/ia64elf.em b/ld/emultempl/ia64elf.em
index ddc5370bfd99f1e168d624ba205153c88bf2923b..88d57480af7a8c3c0a54047616329d42dc8a9180 100644 (file)
--- a/ld/emultempl/ia64elf.em
+++ b/ld/emultempl/ia64elf.em
@@ -1,11 +1,11 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2003 Free Software Foundation, Inc.
+#   Copyright 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
 #
-# This file is part of GLD, the Gnu Linker.
+# This file is part of the GNU Binutils.
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -15,7 +15,8 @@
 #
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 
 # This file is sourced from elf32.em, and defines extra ia64-elf
@@ -24,7 +25,7 @@
 # Define some shell vars to insert bits of code into the standard elf
 # parse_args and list_options functions.
 #
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 
 /* None zero if generating binary for Intel Itanium processor.  */
 static int itanium = 0;
@@ -34,6 +35,8 @@ gld${EMULATION_NAME}_after_parse (void)
 {
   link_info.relax_pass = 2;
   bfd_elf${ELFSIZE}_ia64_after_parse (itanium);
+
+  after_parse_default ();
 }
 
 EOF
@@ -48,7 +51,7 @@ PARSE_AND_LIST_LONGOPTS='
 
 PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("\
-  --itanium             Generate code for Intel Itanium processor\n"
+  --itanium                   Generate code for Intel Itanium processor\n"
                   ));
 '
 
@@ -59,4 +62,4 @@ PARSE_AND_LIST_ARGS_CASES='
 '
 
 LDEMUL_AFTER_PARSE=gld${EMULATION_NAME}_after_parse
-. ${srcdir}/emultempl/needrelax.em
+source_em ${srcdir}/emultempl/needrelax.em