From 36af4a4e51338a12cdd06009ae335ad776b496ff Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 30 May 2003 15:50:12 +0000
Subject: bfd/ 	* elflink.h (elf_link_add_object_symbols): Use
 !info->executable 	instead of info->shared where appropriate. 
 (bfd_elfNN_size_dynamic_sections, elf_link_output_extsym): Likewise. 	*
 elflink.c (_bfd_elf_create_got_section): Likewise. 
 (_bfd_elf_link_create_dynamic_sections): Likewise. 
 (_bfd_elf_link_assign_sym_version): Likewise. 	* elf32-i386.c
 (elf_i386_size_dynamic_sections): Create .interp section 	and DT_DEBUG
 dynamic tag even for position independent executables. 	* elf32-ppc.c
 (ppc_elf_size_dynamic_sections): Likewise. 	* elf32-s390.c
 (elf_s390_size_dynamic_sections: Likewise. 	* elf64-ppc.c
 (ppc64_elf_size_dynamic_sections: Likewise. 	* elf64-s390.c
 (elf_s390_size_dynamic_sections: Likewise. 	* elf64-x86-64.c
 (elf64_x86_64_size_dynamic_sections: Likewise. 	* elfxx-ia64.c
 (elfNN_ia64_size_dynamic_sections: Likewise. 	* elf32-sparc.c
 (elf32_sparc_size_dynamic_sections: Likewise. 	* elf64-alpha.c
 (elf64_alpha_size_dynamic_sections: Likewise. 	* elf64-sparc.c
 (sparc64_elf_size_dynamic_sections: Likewise. include/ 	* bfdlink.h
 (struct bfd_link_info): Add pie and executable 	bits. ld/ 	*
 lexsup.c (OPTION_PIE): Define. 	(ld_options): Add -pie and
 --pic-executable options. 	(parse_args): Handle OPTION_PIE. 	*
 ldmain.c (main): Initialize link_info.pie and 	link_info.executable. 	*
 genscripts.sh: Generate PIE scripts. 	* ld.texinfo: Document -pie and
 --pic-executable options. 	* emultempl/elf32.em
 (gld${EMULATION_NAME}_after_open): 	(gld${EMULATION_NAME}_place_orphan):
 Likewise. 	(gld${EMULATION_NAME}_get_script): Include PIE scripts. 
 * scripttempl/elf.sc: In PIE scripts set . the same way as in 	shared
 scripts. 	* emulparams/elf_i386.sh (GENERATE_PIE_SCRIPT): Set to yes. 
 * emulparams/elf64_ia64.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf32ppc.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf64ppc.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf_x86_64.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf_s390.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf32_sparc.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf64_sparc.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf64alpha.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf64_s390.sh (GENERATE_PIE_SCRIPT): Likewise. 	*
 emulparams/elf_i386.sh (GENERATE_PIE_SCRIPT): Likewise.

---
 ld/emultempl/elf32.em | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'ld/emultempl')

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 8d863ee..11668fd 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -643,7 +643,7 @@ gld${EMULATION_NAME}_after_open ()
   struct bfd_link_needed_list *needed, *l;
 
   /* We only need to worry about this when doing a final link.  */
-  if (link_info.relocateable || link_info.shared)
+  if (link_info.relocateable || !link_info.executable)
     return;
 
   /* Get the list of files which appear in DT_NEEDED entries in
@@ -1180,7 +1180,7 @@ gld${EMULATION_NAME}_place_orphan (file, s)
 
   /* If this is a final link, then always put .gnu.warning.SYMBOL
      sections into the .text section to get them out of the way.  */
-  if (! link_info.shared
+  if (link_info.executable
       && ! link_info.relocateable
       && strncmp (secname, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0
       && hold_text.os != NULL)
@@ -1474,6 +1474,14 @@ if cmp -s ldscripts/${EMULATION_NAME}.x ldscripts/${EMULATION_NAME}.xn; then : ;
 echo '  ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xn                 >> e${EMULATION_NAME}.c
 fi
+if test -n "$GENERATE_PIE_SCRIPT" ; then
+if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
+echo '  ; else if (link_info.pie && link_info.combreloc) return' >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xdc                >> e${EMULATION_NAME}.c
+fi
+echo '  ; else if (link_info.pie) return'	       >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xd                 >> e${EMULATION_NAME}.c
+fi
 if test -n "$GENERATE_SHLIB_SCRIPT" ; then
 if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
 echo '  ; else if (link_info.shared && link_info.combreloc) return' >> e${EMULATION_NAME}.c
@@ -1511,6 +1519,18 @@ cat >>e${EMULATION_NAME}.c <<EOF
     return "ldscripts/${EMULATION_NAME}.xn";
 EOF
 fi
+if test -n "$GENERATE_PIE_SCRIPT" ; then
+if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
+cat >>e${EMULATION_NAME}.c <<EOF
+  else if (link_info.pie && link_info.combreloc)
+    return "ldscripts/${EMULATION_NAME}.xdc";
+EOF
+fi
+cat >>e${EMULATION_NAME}.c <<EOF
+  else if (link_info.pie)
+    return "ldscripts/${EMULATION_NAME}.xd";
+EOF
+fi
 if test -n "$GENERATE_SHLIB_SCRIPT" ; then
 if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
 cat >>e${EMULATION_NAME}.c <<EOF
-- 
cgit v1.1