From 7ee314faa48ba637641861e0288736cb4666f940 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 23 Sep 2009 13:54:29 +0000 Subject: [PATCH] bfd/ * bfd-in.h (bfd_elf_size_dynamic_sections): Add audit and depaudit arguments. * elflink.c (bfd_elf_size_dynamic_sections): Generate DT_AUDIT, DT_DEPAUDIT from audit/depaudit arguments. (elf_finalize_dynstr): Finalize DT_AUDIT and DT_DEPAUDIT strtab entries. (elf_link_add_object_symbols): Set dt_audit target data when finding a DT_AUDIT. * bfd-in2.h: Regenerate. * bfd-elf.h: Add dt_audit to elf_obj_tdata, and elf_dt_audit macro. ld/ * emultempl/elf32.em (gld${EMULATION_NAME}_add_options): Add --audit, --depaudit, and -P options. (gld${EULATION_NAME}_handle_options): Ditto. (gld${EULATION_NAME}_list_options): Ditto. (gld${EMULATION_NAME}_append_to_separated_string): New function for handling rpath-like colon separated strings. (gld${EMULATION_NAME}_before_allocation): Pass the audit and depaudit libs to bfd. Propagate DT_AUDIT from needed libs to depaudit. * ld.texinfo: Document new options. ld/testsuite/ * ld-elf/audit.exp: New. * ld-elf/audit.rd: New. * ld-elf/depaudit.rd: New. * ld-elf/depaudit2.rd: New. --- bfd/ChangeLog | 26 ++++++--- bfd/bfd-in.h | 4 +- bfd/bfd-in2.h | 4 +- bfd/elf-bfd.h | 5 ++ bfd/elflink.c | 35 ++++++++++++ ld/ChangeLog | 20 +++++-- ld/emultempl/elf32.em | 93 +++++++++++++++++++++++++++++++- ld/ld.texinfo | 22 ++++++++ ld/testsuite/ChangeLog | 11 +++- ld/testsuite/ld-elf/audit.exp | 65 ++++++++++++++++++++++ ld/testsuite/ld-elf/audit.rd | 3 ++ ld/testsuite/ld-elf/depaudit.rd | 3 ++ ld/testsuite/ld-elf/depaudit2.rd | 3 ++ 13 files changed, 275 insertions(+), 19 deletions(-) create mode 100644 ld/testsuite/ld-elf/audit.exp create mode 100644 ld/testsuite/ld-elf/audit.rd create mode 100644 ld/testsuite/ld-elf/depaudit.rd create mode 100644 ld/testsuite/ld-elf/depaudit2.rd diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 09194ce25a..8e108ac703 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2009-09-23 Matt Rice + + * bfd-in.h (bfd_elf_size_dynamic_sections): Add audit and depaudit + arguments. + * elflink.c (bfd_elf_size_dynamic_sections): Generate DT_AUDIT, + DT_DEPAUDIT from audit/depaudit arguments. + (elf_finalize_dynstr): Finalize DT_AUDIT and DT_DEPAUDIT strtab entries. + (elf_link_add_object_symbols): Set dt_audit target data when finding a + DT_AUDIT. + * bfd-in2.h: Regenerate. + * bfd-elf.h: Add dt_audit to elf_obj_tdata, and elf_dt_audit macro. + 2009-09-23 Jie Zhang * elf32-bfin.c (_bfinfdpic_size_got_plt): Make sure empty @@ -110,7 +122,7 @@ assignments in test. 2009-09-16 Tristan Gingold - + * mach-o.h (bfd_mach_o_filetype): Add new constants from darwin10. Reindent. * mach-o.c (bfd_mach_o_cpu_name): Reindent. @@ -625,7 +637,7 @@ bfinfdpic_gc_sweep_hook, bfinfdpic_check_relocs, bfin_finish_dynamic_symbol, bfd_bfin_elf32_create_embedded_relocs): Adjust to match the renamed reloc definitions. - + 2009-08-08 Alan Modra PR 10494 @@ -1146,7 +1158,7 @@ (bfd_mach_o_print_thread): Define. * mach-o.c (text_section_names_xlat): Add an entry for __const. - (bfd_mach_o_canonicalize_one_reloc, bfd_mach_o_canonicalize_relocs): + (bfd_mach_o_canonicalize_one_reloc, bfd_mach_o_canonicalize_relocs): New functions extracted from ... (bfd_mach_o_canonicalize_reloc): ... This. Simplified. (bfd_mach_o_get_dynamic_reloc_upper_bound): New function. @@ -1793,7 +1805,7 @@ (bfd_mach_o_scan_read_dysymtab_symbol): Ditto. (bfd_mach_o_get_reloc_upper_bound): New prototype. (bfd_mach_o_canonicalize_reloc): Ditto. - + * mach-o-target.c (bfd_mach_o_bfd_is_local_label_name): Remove duplicated macro. Now defined to _bfd_generic_is_local_label. (TARGET_NAME_BACKEND): New macro... @@ -1830,15 +1842,15 @@ Clean up copyright notice. 2009-06-10 Paul Pluzhnikov - + * bfd-in2.h: bfd_mmap prototype. * bfdio.c (bfd_mmap): New function. * libbfd.h (bfd_iovec): Add bmmap. * cache.c (cache_bmmap): New function. (cache_iovec): Initialize bmmap member. * opencls.c (opncls_bmmap): New function. - (opncls_iovec): Initialize bmmap member. - + (opncls_iovec): Initialize bmmap member. + 2009-06-09 Tristan Gingold * mach-o.h (bfd_mach_o_symtab_command): Remove stabs_segment diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 516102eb94..c3d2d97806 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -635,8 +635,8 @@ extern struct bfd_link_needed_list *bfd_elf_get_needed_list extern bfd_boolean bfd_elf_get_bfd_needed_list (bfd *, struct bfd_link_needed_list **); extern bfd_boolean bfd_elf_size_dynamic_sections - (bfd *, const char *, const char *, const char *, const char * const *, - struct bfd_link_info *, struct bfd_section **, + (bfd *, const char *, const char *, const char *, const char *, const char *, + const char * const *, struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *); extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr (bfd *, struct bfd_link_info *); diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 40d3b7a896..b5fceb7210 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -642,8 +642,8 @@ extern struct bfd_link_needed_list *bfd_elf_get_needed_list extern bfd_boolean bfd_elf_get_bfd_needed_list (bfd *, struct bfd_link_needed_list **); extern bfd_boolean bfd_elf_size_dynamic_sections - (bfd *, const char *, const char *, const char *, const char * const *, - struct bfd_link_info *, struct bfd_section **, + (bfd *, const char *, const char *, const char *, const char *, const char *, + const char * const *, struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *); extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr (bfd *, struct bfd_link_info *); diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 3f2d52864b..7cc420c7a8 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1503,6 +1503,10 @@ struct elf_obj_tdata one. */ const char *dt_name; + /* The linker emulation needs to know what audit libs + are used by a dynamic object. */ + const char *dt_audit; + /* Records the result of `get_program_header_size'. */ bfd_size_type program_header_size; @@ -1632,6 +1636,7 @@ struct elf_obj_tdata #define elf_local_got_offsets(bfd) (elf_tdata(bfd) -> local_got.offsets) #define elf_local_got_ents(bfd) (elf_tdata(bfd) -> local_got.ents) #define elf_dt_name(bfd) (elf_tdata(bfd) -> dt_name) +#define elf_dt_audit(bfd) (elf_tdata(bfd) -> dt_audit) #define elf_dyn_lib_class(bfd) (elf_tdata(bfd) -> dyn_lib_class) #define elf_bad_symtab(bfd) (elf_tdata(bfd) -> bad_symtab) #define elf_flags_init(bfd) (elf_tdata(bfd) -> flags_init) diff --git a/bfd/elflink.c b/bfd/elflink.c index c42c6e135b..b99aceaa4b 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3234,6 +3234,8 @@ elf_finalize_dynstr (bfd *output_bfd, struct bfd_link_info *info) case DT_RUNPATH: case DT_FILTER: case DT_AUXILIARY: + case DT_AUDIT: + case DT_DEPAUDIT: dyn.d_un.d_val = _bfd_elf_strtab_offset (dynstr, dyn.d_un.d_val); break; default: @@ -3525,6 +3527,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) { asection *s; const char *soname = NULL; + char *audit = NULL; struct bfd_link_needed_list *rpath = NULL, *runpath = NULL; int ret; @@ -3653,6 +3656,11 @@ error_free_dyn: ; *pn = n; } + if (dyn.d_tag == DT_AUDIT) + { + unsigned int tagv = dyn.d_un.d_val; + audit = bfd_elf_string_from_elf_section (abfd, shlink, tagv); + } } free (dynbuf); @@ -3705,6 +3713,9 @@ error_free_dyn: particular dynamic object more than once. */ if (ret > 0) return TRUE; + + /* Save the DT_AUDIT entry for the linker emulation code. */ + elf_dt_audit (abfd) = audit; } /* If this is a dynamic object, we always link against the .dynsym @@ -5451,6 +5462,8 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, const char *soname, const char *rpath, const char *filter_shlib, + const char *audit, + const char *depaudit, const char * const *auxiliary_filters, struct bfd_link_info *info, asection **sinterpptr, @@ -5603,6 +5616,28 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd, } } + if (audit != NULL) + { + bfd_size_type indx; + + indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, audit, + TRUE); + if (indx == (bfd_size_type) -1 + || !_bfd_elf_add_dynamic_entry (info, DT_AUDIT, indx)) + return FALSE; + } + + if (depaudit != NULL) + { + bfd_size_type indx; + + indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, depaudit, + TRUE); + if (indx == (bfd_size_type) -1 + || !_bfd_elf_add_dynamic_entry (info, DT_DEPAUDIT, indx)) + return FALSE; + } + eif.info = info; eif.verdefs = verdefs; eif.failed = FALSE; diff --git a/ld/ChangeLog b/ld/ChangeLog index 0bcb74d6f1..7e8c310bdd 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2009-09-23 Matt Rice + + * emultempl/elf32.em (gld${EMULATION_NAME}_add_options): Add --audit, + --depaudit, and -P options. + (gld${EULATION_NAME}_handle_options): Ditto. + (gld${EULATION_NAME}_list_options): Ditto. + (gld${EMULATION_NAME}_append_to_separated_string): New function for + handling rpath-like colon separated strings. + (gld${EMULATION_NAME}_before_allocation): Pass the audit and depaudit + libs to bfd. Propagate DT_AUDIT from needed libs to depaudit. + * ld.texinfo: Document new options. + 2009-09-23 Nick Clifton * po/vi.po: Updated Vietnamese translation. @@ -311,13 +323,13 @@ 2009-08-06 Michael Eager - * Makefile.am: Add eelf32mb_linux.o, eelf32microblaze.o to + * Makefile.am: Add eelf32mb_linux.o, eelf32microblaze.o to ALL_EMULATIONS, targets. * Makefile.in: Regenerate. * configure.tgt: Add microblaze*-linux*, microblaze* targets. * emulparams/elf32mb_linux.sh: New. * emulparams/elf32microblaze.sh. New. - * scripttempl/elfmicroblaze.sc: New. + * scripttempl/elfmicroblaze.sc: New. 2009-08-05 Trevor Smigiel @@ -408,7 +420,7 @@ * scripttempl/pep.sc: Put .eh_frame in its own section. * scripttempl/pe.sc: Ditto. - + 2009-06-26 Kai Tietz * scripttempl/pe.sc (.debug_pubtypes): Added section rule. @@ -941,7 +953,7 @@ 2009-02-24 Sandra Loosemore * ld.texinfo (Options): Correct typos in example. Recommend - using joined forms of syntax for passing options with arguments + using joined forms of syntax for passing options with arguments from a driver. (-a): Use consistent syntax for documenting option arguments. Clean up indexing and markup. diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 9518714e16..f7b70acf5d 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -157,6 +157,10 @@ static lang_input_statement_type *global_found; static struct bfd_link_needed_list *global_vercheck_needed; static bfd_boolean global_vercheck_failed; +/* These variables are used to implement target options */ + +static char *audit; /* colon (typically) separated list of libs */ +static char *depaudit; /* colon (typically) separated list of libs */ /* On Linux, it's possible to have different versions of the same shared library linked against different versions of libc. The @@ -1396,6 +1400,46 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != xgld"$EMULATION_NAME"_before_allocation; fi fragment <type == bfd_link_elf_hash_table) _bfd_elf_tls_setup (link_info.output_bfd, &link_info); @@ -1418,9 +1463,39 @@ gld${EMULATION_NAME}_before_allocation (void) rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) + { + const char *audit_libs = elf_dt_audit (abfd); + + /* If the input bfd contains an audit entry, we need to add it as + a dep audit entry. */ + if (audit_libs && *audit_libs != '\0') + { + char *cp = xstrdup (audit_libs); + do + { + int more = 0; + char *cp2 = strchr (cp, config.rpath_separator); + + if (cp2) + { + *cp2 = '\0'; + more = 1; + } + + if (cp != NULL && *cp != '\0') + gld${EMULATION_NAME}_append_to_separated_string (&depaudit, cp); + + cp = more ? ++cp2 : NULL; + } + while (cp != NULL); + } + } + if (! (bfd_elf_size_dynamic_sections (link_info.output_bfd, command_line.soname, rpath, - command_line.filter_shlib, + command_line.filter_shlib, audit, depaudit, (const char * const *) command_line.auxiliary_filters, &link_info, &sinterp, lang_elf_version_info))) einfo ("%P%F: failed to set dynamic section sizes: %E\n"); @@ -2007,15 +2082,18 @@ fragment < + + * ld-elf/audit.exp: New. + * ld-elf/audit.rd: New. + * ld-elf/depaudit.rd: New. + * ld-elf/depaudit2.rd: New. + 2009-09-23 Jie Zhang * ld-srec/srec.exp: Add xfails for bfin-*-linux-uclibc. @@ -136,7 +143,7 @@ two new link tests. * ld-powerpc/tlsexe.d: Update for new __tls_get_addr stub. * ld-powerpc/tlsexe.g, * ld-powerpc/tlsexe.r, *ld-powerpc/tlsexe32.d, - * ld-powerpc/tlsexe32.g, * ld-powerpc/tlsexe32.r, + * ld-powerpc/tlsexe32.g, * ld-powerpc/tlsexe32.r, * ld-powerpc/tlsexetoc.d, * ld-powerpc/tlsexetoc.g, * ld-powerpc/tlsexetoc.r: Likewise. @@ -792,7 +799,7 @@ * ld-arm/arm-elf.exp (armeabitests): Add thumb2-bl-blx-interwork test. * ld-arm/thumb2-bl-blx-interwork.s: New. - * ld-arm/thumb2-bl-blx-interwork.d: New. + * ld-arm/thumb2-bl-blx-interwork.d: New. 2009-04-30 Nick Clifton diff --git a/ld/testsuite/ld-elf/audit.exp b/ld/testsuite/ld-elf/audit.exp new file mode 100644 index 0000000000..407c61af1c --- /dev/null +++ b/ld/testsuite/ld-elf/audit.exp @@ -0,0 +1,65 @@ +# Expect script for various ELF tests. +# Copyright 2009 Free Software Foundation, Inc. +# +# 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 3 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., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +# Exclude non-ELF targets. + +if ![is_elf_format] { + return +} + +# The following tests require running the executable generated by ld. +if ![isnative] { + return +} + +# Check if compiler works +if { [which $CC] == 0 } { + return +} + +set build_tests { + {"Run with -paudit.so" + "-Wl,--audit=tmpdir/audit.so" "" + {main.c} {{"readelf" {-d} "audit.rd"}} "audit.out"} + {"Run with -Paudit.so" + "-Wl,-Ptmpdir/audit.so" "" + {main.c} {{"readelf" {-d} "depaudit.rd"}} "depaudit.out"} + {"Run with --depaudit=audit.so" + "-Wl,--depaudit=tmpdir/audit.so" "" + {main.c} {{"readelf" {-d} "depaudit.rd"}} "depaudit2.out"} + {"Run with shared with --audit" + "-shared -Wl,--audit=tmpdir/audit.so" "-fPIC" + {main.c} {} "libusesaudit.so"} + {"Run with shared with --audit" + "-shared -Wl,--audit=tmpdir/audit.so -Wl,--audit=tmpdir/audit2.so \ + -Wl,--audit=tmpdir/audit3.so" + "-fPIC" + {main.c} {} "libusesaudit2.so"} + {"Run with -lusesaudit" + "-Ltmpdir/ -lusesaudit" "" + {main.c} {{"readelf" {-d} "depaudit.rd"}} "useslibusesaudit.out"} + {"Run with -lusesaudit -lusesaudit2" + "-Ltmpdir/ -lusesaudit -lusesaudit2" "" + {main.c} {{"readelf" {-d} "depaudit2.rd"}} "useslibusesaudit2.out"} +} + +run_cc_link_tests $build_tests + diff --git a/ld/testsuite/ld-elf/audit.rd b/ld/testsuite/ld-elf/audit.rd new file mode 100644 index 0000000000..fd3b94149a --- /dev/null +++ b/ld/testsuite/ld-elf/audit.rd @@ -0,0 +1,3 @@ +#... +.*Audit library: \[tmpdir/audit.so\].* +#pass diff --git a/ld/testsuite/ld-elf/depaudit.rd b/ld/testsuite/ld-elf/depaudit.rd new file mode 100644 index 0000000000..98a2692381 --- /dev/null +++ b/ld/testsuite/ld-elf/depaudit.rd @@ -0,0 +1,3 @@ +#... +.*Dependency audit library: \[tmpdir/audit.so\].* +#pass diff --git a/ld/testsuite/ld-elf/depaudit2.rd b/ld/testsuite/ld-elf/depaudit2.rd new file mode 100644 index 0000000000..3554416f05 --- /dev/null +++ b/ld/testsuite/ld-elf/depaudit2.rd @@ -0,0 +1,3 @@ +#... +.*Dependency audit library: \[tmpdir/audit.so:tmpdir/audit2.so:tmpdir/audit3.so\].* +#pass -- 2.34.1