* Makefile.am (eelf64ppc.c, eelf64lppc.c): Depend on ppc64elf.em.

	* Makefile.in: Regenerate.
	* emulparams/elf64ppc.sh (EXTRA_EM_FILE): Define.
	* emultempl/ppc64elf.em: New file.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6dd069db2214abd7346556ea3bbbfb1d98ec1f14..7d1f794397620ba9fcfeb4f752f6a91e2b76f7cd 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * Makefile.am (eelf64ppc.c, eelf64lppc.c): Depend on ppc64elf.em.
+       * Makefile.in: Regenerate.
+       * emulparams/elf64ppc.sh (EXTRA_EM_FILE): Define.
+       * emultempl/ppc64elf.em: New file.
+
 2002-01-15  DJ Delorie  <dj@redhat.com>
 
        * scripttempl/pe.sc: Add support for constructor priorities.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 329a316406594497d5e6a16840f0c0e8b973ee28..1d59e83d3a7ed7e14ef0353a06d12f5bd8ccf695 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -533,11 +533,11 @@ eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf32ppclinux "$(tdir_elf32ppclinux)"
-eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh \
+eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
 eelf64lppc.c: $(srcdir)/emulparams/elf64lppc.sh \
-  $(srcdir)/emulparams/elf64ppc.sh \
+  $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf64lppc "$(tdir_elf64lppc)"
 eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \

diff --git a/ld/Makefile.in b/ld/Makefile.in
index f409fbc4a7febb1d5b2decbbcd8dbf7ac70876e2..1518e3f140a20b338624b1ea63c7c620d6d2ce30 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1254,11 +1254,11 @@ eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf32ppclinux "$(tdir_elf32ppclinux)"
-eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh \
+eelf64ppc.c: $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf64ppc "$(tdir_elf64ppc)"
 eelf64lppc.c: $(srcdir)/emulparams/elf64lppc.sh \
-  $(srcdir)/emulparams/elf64ppc.sh \
+  $(srcdir)/emulparams/elf64ppc.sh $(srcdir)/emultempl/ppc64elf.em \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf64lppc "$(tdir_elf64lppc)"
 eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \

diff --git a/ld/emulparams/elf64ppc.sh b/ld/emulparams/elf64ppc.sh
index 9384a1eec608b3146d84467117d3cf382eee3900..2169862348c09ec2a2e08ef35c3bfec0a6f1e5e0 100644 (file)
--- a/ld/emulparams/elf64ppc.sh
+++ b/ld/emulparams/elf64ppc.sh
@@ -1,4 +1,5 @@
 TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=ppc64elf
 ELFSIZE=64
 GENERATE_SHLIB_SCRIPT=yes
 SCRIPT_NAME=elf

diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
new file mode 100644 (file)
index 0000000..655ddea
--- /dev/null
+++ b/ld/emultempl/ppc64elf.em
@@ -0,0 +1,99 @@
+# This shell script emits a C file. -*- C -*-
+#   Copyright 2002 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 powerpc64-elf
+# specific routines.
+#
+cat >>e${EMULATION_NAME}.c <<EOF
+
+#include "elf64-ppc.h"
+
+static int need_laying_out = 0;
+
+static void gld${EMULATION_NAME}_after_allocation PARAMS ((void));
+static void gld${EMULATION_NAME}_finish PARAMS ((void));
+
+/* Call the back-end function to set TOC base after we have placed all
+   the sections.  */
+static void
+gld${EMULATION_NAME}_after_allocation ()
+{
+  if (!ppc64_elf_set_toc (output_bfd, &link_info))
+    einfo ("%X%P: can not set TOC base: %E\n");
+}
+
+/* Final emulation specific call.  PowerPC64 has 24 byte .plt entries,
+   and needs different call stubs for any entries that cross a 64k
+   boundary relative to the TOC.  That means we need to wait until all
+   sections have been laid out to initialise the stubs.  */
+
+static void
+gld${EMULATION_NAME}_finish ()
+{
+  /* If generating a relocatable output file, then we don't have any
+     stubs.  */
+  if (link_info.relocateable)
+    return;
+
+  /* bfd_elf64_discard_info just plays with debugging sections,
+     ie. doesn't affect any code, so we can delay resizing the
+     sections.  It's likely we'll resize everything in the process of
+     adjusting stub sizes.  */
+  if (bfd_elf${ELFSIZE}_discard_info (output_bfd, &link_info))
+    need_laying_out = 1;
+
+  while (1)
+    {
+      /* Call into the BFD backend to do the real work.  */
+      if (! ppc64_elf_size_stubs (output_bfd, &link_info, &need_laying_out))
+       {
+         einfo ("%X%P: can not size stub section: %E\n");
+         return;
+       }
+
+      if (!need_laying_out)
+       break;
+
+      /* If we have changed the size of the stub section, then we need
+        to recalculate all the section offsets.  After this, we may
+        need to adjust the stub size again.  */
+      need_laying_out = 0;
+
+      /* Resize the sections.  */
+      lang_size_sections (stat_ptr->head, abs_output_section,
+                         &stat_ptr->head, 0, (bfd_vma) 0, NULL);
+
+      /* Recalculate TOC base.  */
+      ldemul_after_allocation ();
+
+      /* Do the assignments again.  */
+      lang_do_assignments (stat_ptr->head, abs_output_section,
+                          (fill_type) 0, (bfd_vma) 0);
+    }
+
+  if (! ppc64_elf_build_stubs (output_bfd, &link_info))
+    einfo ("%X%P: can not build stubs: %E\n");
+}
+EOF
+
+# Put these extra ppc64elf routines in ld_${EMULATION_NAME}_emulation
+#
+LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
+LDEMUL_FINISH=gld${EMULATION_NAME}_finish