From 36af4a4e51338a12cdd06009ae335ad776b496ff Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 30 May 2003 15:50:12 +0000 Subject: [PATCH] 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. --- bfd/ChangeLog | 21 +++++++++++++++++++++ bfd/elf32-i386.c | 4 ++-- bfd/elf32-ppc.c | 4 ++-- bfd/elf32-s390.c | 4 ++-- bfd/elf32-sparc.c | 4 ++-- bfd/elf64-alpha.c | 4 ++-- bfd/elf64-ppc.c | 4 ++-- bfd/elf64-s390.c | 4 ++-- bfd/elf64-sparc.c | 4 ++-- bfd/elf64-x86-64.c | 4 ++-- bfd/elflink.c | 10 +++++----- bfd/elflink.h | 11 ++++++----- bfd/elfxx-ia64.c | 4 ++-- include/ChangeLog | 6 ++++++ include/bfdlink.h | 6 ++++++ ld/ChangeLog | 27 +++++++++++++++++++++++++++ ld/emulparams/elf32_sparc.sh | 1 + ld/emulparams/elf32ppc.sh | 1 + ld/emulparams/elf64_ia64.sh | 1 + ld/emulparams/elf64_s390.sh | 1 + ld/emulparams/elf64_sparc.sh | 1 + ld/emulparams/elf64alpha.sh | 1 + ld/emulparams/elf64ppc.sh | 1 + ld/emulparams/elf_i386.sh | 1 + ld/emulparams/elf_s390.sh | 1 + ld/emulparams/elf_x86_64.sh | 1 + ld/emultempl/elf32.em | 24 ++++++++++++++++++++++-- ld/genscripts.sh | 25 +++++++++++++++++++++++++ ld/ld.texinfo | 12 ++++++++++++ ld/ldmain.c | 5 +++++ ld/lexsup.c | 14 ++++++++++++++ ld/scripttempl/elf.sc | 3 ++- 32 files changed, 181 insertions(+), 33 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index aa1aeae0da..8eb1bfe5e3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,24 @@ +2003-05-30 Ulrich Drepper + Jakub Jelinek + + * 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. + 2003-05-30 Kris Warkentin * elf.c (elfcore_grok_nto_status): Only set lwpid for the active or diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index cfcb7b34c1..cd3dc9acbe 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1797,7 +1797,7 @@ elf_i386_size_dynamic_sections (output_bfd, info) if (htab->elf.dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) @@ -1963,7 +1963,7 @@ elf_i386_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (! info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 1e1ab8cce3..8c0e4d5e8f 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -2920,7 +2920,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (htab->elf.dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -3102,7 +3102,7 @@ ppc_elf_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (!info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 9475f60a66..97be1dbd01 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -1927,7 +1927,7 @@ elf_s390_size_dynamic_sections (output_bfd, info) if (htab->elf.dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) @@ -2085,7 +2085,7 @@ elf_s390_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (! info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index e2c6544815..5f1bec589c 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -1820,7 +1820,7 @@ elf32_sparc_size_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -1997,7 +1997,7 @@ elf32_sparc_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (!info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 9ce3bf3b56..58ab6ba7a5 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -4090,7 +4090,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (!info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -4176,7 +4176,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (!info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index f32d261fe6..98af624baf 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -5737,7 +5737,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info) if (htab->elf.dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) @@ -5936,7 +5936,7 @@ ppc64_elf_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (!info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 98555f269b..b5d724a558 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -1898,7 +1898,7 @@ elf_s390_size_dynamic_sections (output_bfd, info) if (htab->elf.dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) @@ -2056,7 +2056,7 @@ elf_s390_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (! info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index d7ad1b725d..d25b429337 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -1781,7 +1781,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -1880,7 +1880,7 @@ sparc64_elf_size_dynamic_sections (output_bfd, info) struct elf_strtab_hash *dynstr; struct elf_link_hash_table *eht = elf_hash_table (info); - if (!info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index c0ce57d708..b39cdcd819 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -1618,7 +1618,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info) if (htab->elf.dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); if (s == NULL) @@ -1779,7 +1779,7 @@ elf64_x86_64_size_dynamic_sections (output_bfd, info) #define add_dynamic_entry(TAG, VAL) \ bfd_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL)) - if (! info->shared) + if (info->executable) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; diff --git a/bfd/elflink.c b/bfd/elflink.c index cc311863e1..d6f6d705ea 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -94,7 +94,7 @@ _bfd_elf_create_got_section (abfd, info) h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; h->type = STT_OBJECT; - if (info->shared + if (! info->executable && ! _bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; @@ -144,7 +144,7 @@ _bfd_elf_link_create_dynamic_sections (abfd, info) /* A dynamically linked executable has a .interp section, but a shared library does not. */ - if (! info->shared) + if (info->executable) { s = bfd_make_section (abfd, ".interp"); if (s == NULL @@ -227,7 +227,7 @@ _bfd_elf_link_create_dynamic_sections (abfd, info) h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; h->type = STT_OBJECT; - if (info->shared + if (! info->executable && ! _bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; @@ -295,7 +295,7 @@ _bfd_elf_create_dynamic_sections (abfd, info) h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; h->type = STT_OBJECT; - if (info->shared + if (! info->executable && ! _bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; } @@ -1760,7 +1760,7 @@ _bfd_elf_link_assign_sym_version (h, data) /* If we are building an application, we need to create a version node for this version. */ - if (t == NULL && ! info->shared) + if (t == NULL && info->executable) { struct bfd_elf_version_tree **pp; int version_index; diff --git a/bfd/elflink.h b/bfd/elflink.h index 7b32491d94..e7019f3761 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -474,7 +474,7 @@ elf_link_add_object_symbols (abfd, info) .gnu.warning.SYMBOL are treated as warning symbols for the given symbol. This differs from .gnu.warning sections, which generate warnings when they are included in an output file. */ - if (! info->shared) + if (info->executable) { asection *s; @@ -1321,7 +1321,7 @@ elf_link_add_object_symbols (abfd, info) } else new_flag = ELF_LINK_HASH_DEF_REGULAR; - if (info->shared + if (! info->executable || (old_flags & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_DYNAMIC)) != 0) dynsym = TRUE; @@ -2174,7 +2174,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, if (bfd_get_section_by_name (output_bfd, ".preinit_array") != NULL) { /* DT_PREINIT_ARRAY is not allowed in shared library. */ - if (info->shared) + if (! info->executable) { bfd *sub; asection *o; @@ -2440,7 +2440,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath, if (info->flags_1) { - if (! info->shared) + if (info->executable) info->flags_1 &= ~ (DF_1_INITFIRST | DF_1_NODELETE | DF_1_NOOPEN); @@ -4417,7 +4417,8 @@ elf_link_output_extsym (h, data) referenced by regular files, because we will already have issued warnings for them. */ if (! finfo->info->relocateable - && (! finfo->info->shared || ! finfo->info->allow_shlib_undefined) + && (finfo->info->executable + || ! finfo->info->allow_shlib_undefined) && h->root.type == bfd_link_hash_undefined && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0 && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0 diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c index ab2ff21c88..37fc968f53 100644 --- a/bfd/elfxx-ia64.c +++ b/bfd/elfxx-ia64.c @@ -2903,7 +2903,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info) /* Set the contents of the .interp section to the interpreter. */ if (ia64_info->root.dynamic_sections_created - && !info->shared) + && info->executable) { sec = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (sec != NULL); @@ -3078,7 +3078,7 @@ elfNN_ia64_size_dynamic_sections (output_bfd, info) later (in finish_dynamic_sections) but we must add the entries now so that we get the correct size for the .dynamic section. */ - if (!info->shared) + if (info->executable) { /* The DT_DEBUG entry is filled in by the dynamic linker and used by the debugger. */ diff --git a/include/ChangeLog b/include/ChangeLog index 8dfa46f77c..41e67bc330 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2003-05-30 Ulrich Drepper + Jakub Jelinek + + * bfdlink.h (struct bfd_link_info): Add pie and executable + bits. + 2003-05-21 Nick Clifton * bfdlink.h (struct bfd_link_hash_table): Fix typo in comment. diff --git a/include/bfdlink.h b/include/bfdlink.h index 89d916ee83..61fcf96f40 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -291,6 +291,12 @@ struct bfd_link_info /* TRUE if relaxation is being finalized. */ unsigned int relax_finalizing: 1; + /* TRUE if generating a position independent executable. */ + unsigned int pie: 1; + + /* TRUE if generating an executable, position independent or not. */ + unsigned int executable : 1; + /* Which symbols to strip. */ enum bfd_link_strip strip; diff --git a/ld/ChangeLog b/ld/ChangeLog index 52620acd46..bfd7846a3b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,30 @@ +2003-05-30 Ulrich Drepper + Jakub Jelinek + + * 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. + 2003-05-30 H.J. Lu * genscripts.sh: Create tmpdir/libpath.exp. diff --git a/ld/emulparams/elf32_sparc.sh b/ld/emulparams/elf32_sparc.sh index 15a837df28..af23252949 100644 --- a/ld/emulparams/elf32_sparc.sh +++ b/ld/emulparams/elf32_sparc.sh @@ -10,4 +10,5 @@ MACHINE= TEMPLATE_NAME=elf32 DATA_PLT= GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf32ppc.sh b/ld/emulparams/elf32ppc.sh index d2d704135a..ea05454d6d 100644 --- a/ld/emulparams/elf32ppc.sh +++ b/ld/emulparams/elf32ppc.sh @@ -4,6 +4,7 @@ TEMPLATE_NAME=elf32 EXTRA_EM_FILE=ppc32elf GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-powerpc" TEXT_START_ADDR=0x01800000 diff --git a/ld/emulparams/elf64_ia64.sh b/ld/emulparams/elf64_ia64.sh index 817c50adad..85ffe61a8b 100644 --- a/ld/emulparams/elf64_ia64.sh +++ b/ld/emulparams/elf64_ia64.sh @@ -16,6 +16,7 @@ fi TEXT_START_ADDR="0x4000000000000000" DATA_ADDR="0x6000000000000000 + (. & (${MAXPAGESIZE} - 1))" GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes NOP=0x00300000010070000002000001000400 # a bundle full of nops OTHER_GOT_SECTIONS=" .IA_64.pltoff ${RELOCATING-0} : { *(.IA_64.pltoff) }" diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh index e441b8ac4d..233eb98a16 100644 --- a/ld/emulparams/elf64_s390.sh +++ b/ld/emulparams/elf64_s390.sh @@ -9,6 +9,7 @@ MACHINE= NOP=0x07070707 TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes # Treat a host that matches the target with the possible exception of "x" # in the name as if it were native. diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh index ab3eec0ec6..0c0f5d89e3 100644 --- a/ld/emulparams/elf64_sparc.sh +++ b/ld/emulparams/elf64_sparc.sh @@ -8,6 +8,7 @@ ARCH="sparc:v9" MACHINE= DATA_PLT= GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes NOP=0x01000000 NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh index 2d16e9caba..093c8dfd8e 100644 --- a/ld/emulparams/elf64alpha.sh +++ b/ld/emulparams/elf64alpha.sh @@ -11,6 +11,7 @@ NONPAGED_TEXT_START_ADDR="0x120000000" ARCH=alpha MACHINE= GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes DATA_PLT= # Note that the number is always big-endian, thus we have to # reverse the digit string. diff --git a/ld/emulparams/elf64ppc.sh b/ld/emulparams/elf64ppc.sh index 300b8d4b54..236b26b587 100644 --- a/ld/emulparams/elf64ppc.sh +++ b/ld/emulparams/elf64ppc.sh @@ -2,6 +2,7 @@ TEMPLATE_NAME=elf32 EXTRA_EM_FILE=ppc64elf ELFSIZE=64 GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes SCRIPT_NAME=elf OUTPUT_FORMAT="elf64-powerpc" TEXT_START_ADDR=0x10000000 diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh index f1b8522fe6..2382286b9a 100644 --- a/ld/emulparams/elf_i386.sh +++ b/ld/emulparams/elf_i386.sh @@ -9,4 +9,5 @@ MACHINE= NOP=0x90909090 TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh index 2804aceeb9..3b51bb28c2 100644 --- a/ld/emulparams/elf_s390.sh +++ b/ld/emulparams/elf_s390.sh @@ -8,3 +8,4 @@ MACHINE= NOP=0x07070707 TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh index 61e8f29f94..6d3705828b 100644 --- a/ld/emulparams/elf_x86_64.sh +++ b/ld/emulparams/elf_x86_64.sh @@ -10,6 +10,7 @@ MACHINE= NOP=0x90909090 TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes +GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes if [ "x${host}" = "x${target}" ]; then diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 8d863ee240..11668fdb9b 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 <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c < ldscripts/${EMULATION_NAME}.xd + if test -n "$GENERATE_COMBRELOC_SCRIPT"; then + LD_FLAG=cpie + DATA_ALIGNMENT=${DATA_ALIGNMENT_sc-${DATA_ALIGNMENT}} + COMBRELOC=ldscripts/${EMULATION_NAME}.xc.tmp + ( echo "/* Script for -pie -z combreloc: position independent executable, combine & sort relocs */" + . ${srcdir}/emulparams/${EMULATION_NAME}.sh + . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc + ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdc + rm -f ${COMBRELOC} + COMBRELOC= + fi + unset CREATE_PIE fi case " $EMULATION_LIBPATH " in diff --git a/ld/ld.texinfo b/ld/ld.texinfo index cfebf096e4..d6e6220330 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -1209,6 +1209,18 @@ command @code{OUTPUT_FORMAT} can also specify the output format, but this option overrides it. @xref{BFD}. @end ifclear +@kindex -pie +@kindex --pic-executable +@item -pie +@itemx --pic-executable +@cindex position independent executables +Create a position independent executable. This is currently only supported on +ELF platforms. Position independent executables are similar to shared +libraries in that they are relocated by the dynamic linker to the virtual +address OS chooses for them (which can varry between invocations), like +normal dynamically linked executables they can be executed and symbols +defined in the executable cannot be overridden by shared libraries. + @kindex -qmagic @item -qmagic This option is ignored for Linux compatibility. diff --git a/ld/ldmain.c b/ld/ldmain.c index 91818e093d..08a0ec4bc6 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -291,6 +291,8 @@ main (argc, argv) link_info.emitrelocations = FALSE; link_info.task_link = FALSE; link_info.shared = FALSE; + link_info.pie = FALSE; + link_info.executable = FALSE; link_info.symbolic = FALSE; link_info.export_dynamic = FALSE; link_info.static_link = FALSE; @@ -368,6 +370,9 @@ main (argc, argv) einfo (_("%P%F: -f may not be used without -shared\n")); } + if (! link_info.shared || link_info.pie) + link_info.executable = TRUE; + /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I don't see how else this can be handled, since in this case we must preserve all externally visible symbols. */ diff --git a/ld/lexsup.c b/ld/lexsup.c index b2f94f1d36..8c85807e32 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -138,6 +138,7 @@ int parsing_defsym = 0; #define OPTION_NO_STRIP_DISCARDED (OPTION_STRIP_DISCARDED + 1) #define OPTION_ACCEPT_UNKNOWN_INPUT_ARCH (OPTION_NO_STRIP_DISCARDED + 1) #define OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH (OPTION_ACCEPT_UNKNOWN_INPUT_ARCH + 1) +#define OPTION_PIE (OPTION_NO_ACCEPT_UNKNOWN_INPUT_ARCH + 1) /* The long options. This structure is used for both the option parsing and the help text. */ @@ -370,6 +371,10 @@ static const struct ld_option ld_options[] = '\0', NULL, N_("Create a shared library"), ONE_DASH }, { {"Bshareable", no_argument, NULL, OPTION_SHARED }, /* FreeBSD. */ '\0', NULL, NULL, ONE_DASH }, + { {"pie", no_argument, NULL, OPTION_PIE}, + '\0', NULL, N_("Create a position independent executable"), ONE_DASH }, + { {"pic-executable", no_argument, NULL, OPTION_PIE}, + '\0', NULL, NULL, TWO_DASHES }, { {"sort-common", no_argument, NULL, OPTION_SORT_COMMON}, '\0', NULL, N_("Sort common symbols by size"), TWO_DASHES }, { {"sort_common", no_argument, NULL, OPTION_SORT_COMMON}, @@ -959,6 +964,15 @@ parse_args (argc, argv) else einfo (_("%P%F: -shared not supported\n")); break; + case OPTION_PIE: + if (config.has_shared) + { + link_info.shared = TRUE; + link_info.pie = TRUE; + } + else + einfo (_("%P%F: -pie not supported\n")); + break; case 'h': /* Used on Solaris. */ case OPTION_SONAME: command_line.soname = optarg; diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index 42d7bda0f5..d4ffcd6818 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -180,8 +180,9 @@ ${RELOCATING- /* For some reason, the Solaris linker makes bad executables SECTIONS { /* Read-only sections, merged into text segment: */ - ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_BASE_ADDRESS};}} + ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+. = ${TEXT_BASE_ADDRESS};}}} ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}} + ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}} ${CREATE_SHLIB-${INTERP}} ${INITIAL_READONLY_SECTIONS} ${TEXT_DYNAMIC+${DYNAMIC}} -- 2.34.1