From b58f81aef6a84930bcb58db39f2bad0c45383a6d Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sat, 16 Oct 2004 18:13:54 +0000 Subject: [PATCH] bfd/ * bfd-in2.h: Regenerate. * bfd.c (struct bfd): Add no_export. * elflink.c (elf_link_add_object_symbols): Handle no_export. ld/ * ldlang.c (struct excluded_lib, excluded_libs, add_excluded_libs) (check_excluded_libs): New. (load_symbols): Call check_excluded_libs. * ldlang.h (add_excluded_libs): New prototype. * emultempl/elf32.em (OPTION_EXCLUDED_LIBS): Define. (gld${EMULATION_NAME}_add_options): Add --exclude-libs. (gld${EMULATION_NAME}_handle_option): Handle --exclude-libs. * ld.texinfo (Command Line Variables): Document --exclude-libs. (Options Specific to i386 PE Targets): Remove --exclude-libs. ld/testsuite/ * ld-elf/exclude1.s, ld-elf/exclude2.s, ld-elf/exclude.exp: New. --- bfd/ChangeLog | 6 ++ bfd/bfd-in2.h | 3 + bfd/bfd.c | 3 + bfd/elflink.c | 8 ++ ld/ChangeLog | 12 +++ ld/emultempl/elf32.em | 8 +- ld/ld.texinfo | 20 ++--- ld/ldlang.c | 63 +++++++++++++++ ld/ldlang.h | 2 + ld/testsuite/ChangeLog | 4 + ld/testsuite/ld-elf/exclude.exp | 137 ++++++++++++++++++++++++++++++++ ld/testsuite/ld-elf/exclude1.s | 3 + ld/testsuite/ld-elf/exclude2.s | 3 + 13 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 ld/testsuite/ld-elf/exclude.exp create mode 100644 ld/testsuite/ld-elf/exclude1.s create mode 100644 ld/testsuite/ld-elf/exclude2.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2b1905a0d13..888c9202555 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2004-10-16 Daniel Jacobowitz + + * bfd-in2.h: Regenerate. + * bfd.c (struct bfd): Add no_export. + * elflink.c (elf_link_add_object_symbols): Handle no_export. + 2004-10-15 Alan Modra * config.bfd: Whitespace cleanup. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 2e137043d6b..a25bef34f61 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -3962,6 +3962,9 @@ struct bfd /* Pointer to structure which contains architecture information. */ const struct bfd_arch_info *arch_info; + /* Flag set if symbols from this BFD should not be exported. */ + bfd_boolean no_export; + /* Stuff only useful for archives. */ void *arelt_data; struct bfd *my_archive; /* The containing archive BFD. */ diff --git a/bfd/bfd.c b/bfd/bfd.c index 8ebc81a9953..0126a9f3e3a 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -133,6 +133,9 @@ CODE_FRAGMENT . {* Pointer to structure which contains architecture information. *} . const struct bfd_arch_info *arch_info; . +. {* Flag set if symbols from this BFD should not be exported. *} +. bfd_boolean no_export; +. . {* Stuff only useful for archives. *} . void *arelt_data; . struct bfd *my_archive; {* The containing archive BFD. *} diff --git a/bfd/elflink.c b/bfd/elflink.c index 75b8c9699b6..68435bb2338 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3778,6 +3778,14 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) (*bed->elf_backend_merge_symbol_attribute) (h, isym, definition, dynamic); + /* If this symbol has default visibility and the user has requested + we not re-export it, then mark it as hidden. */ + if (definition && !dynamic + && (abfd->no_export + || (abfd->my_archive && abfd->my_archive->no_export)) + && ELF_ST_VISIBILITY (isym->st_other) != STV_INTERNAL) + isym->st_other = STV_HIDDEN | (isym->st_other & ~ ELF_ST_VISIBILITY (-1)); + if (isym->st_other != 0 && !dynamic) { unsigned char hvis, symvis, other, nvis; diff --git a/ld/ChangeLog b/ld/ChangeLog index c8541d56668..26d47e70e6e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2004-10-16 Daniel Jacobowitz + + * ldlang.c (struct excluded_lib, excluded_libs, add_excluded_libs) + (check_excluded_libs): New. + (load_symbols): Call check_excluded_libs. + * ldlang.h (add_excluded_libs): New prototype. + * emultempl/elf32.em (OPTION_EXCLUDED_LIBS): Define. + (gld${EMULATION_NAME}_add_options): Add --exclude-libs. + (gld${EMULATION_NAME}_handle_option): Handle --exclude-libs. + * ld.texinfo (Command Line Variables): Document --exclude-libs. + (Options Specific to i386 PE Targets): Remove --exclude-libs. + 2004-10-15 Alan Modra * ldexp.c (exp_fold_tree): Don't immediately exit ld on a diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index f9e2cf96255..c6bc7c2ea4e 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -1571,7 +1571,8 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <next = excluded_libs; + entry->name = xmalloc (end - p + 1); + memcpy (entry->name, p, end - p); + entry->name[end - p] = '\0'; + excluded_libs = entry; + if (*end == '\0') + break; + p = end + 1; + } +} + +static void +check_excluded_libs (bfd *abfd) +{ + struct excluded_lib *lib = excluded_libs; + + while (lib) + { + int len = strlen (lib->name); + const char *filename = lbasename (abfd->filename); + + if (strcmp (lib->name, "ALL") == 0) + { + abfd->no_export = TRUE; + return; + } + + if (strncmp (lib->name, filename, len) == 0 + && (filename[len] == '\0' + || (filename[len] == '.' && filename[len + 1] == 'a' + && filename[len + 2] == '\0'))) + { + abfd->no_export = TRUE; + return; + } + + lib = lib->next; + } +} + /* Get the symbols for an input file. */ static bfd_boolean @@ -1776,6 +1837,8 @@ load_symbols (lang_input_statement_type *entry, break; case bfd_archive: + check_excluded_libs (entry->the_bfd); + if (entry->whole_archive) { bfd *member = NULL; diff --git a/ld/ldlang.h b/ld/ldlang.h index 9b0f9eff181..d6b9a797f8e 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -589,4 +589,6 @@ extern int lang_symbol_definition_iteration (const char *); extern void lang_update_definedness (const char *, struct bfd_link_hash_entry *); +extern void add_excluded_libs (const char *); + #endif diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 03ba805642e..dfe0e7a5d26 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-10-16 Daniel Jacobowitz + + * ld-elf/exclude1.s, ld-elf/exclude2.s, ld-elf/exclude.exp: New. + 2004-10-15 Alan Modra * ld-crx/reloc-num8.d: Adjust for changed orphan placement. diff --git a/ld/testsuite/ld-elf/exclude.exp b/ld/testsuite/ld-elf/exclude.exp new file mode 100644 index 00000000000..ffe6b028e7e --- /dev/null +++ b/ld/testsuite/ld-elf/exclude.exp @@ -0,0 +1,137 @@ +# Expect script for --exclude-libs tests +# Copyright 2004 Free Software Foundation, Inc. +# +# This file 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. + +# Make sure that ld can hide symbols from libraries when building a shared +# library. + +# This test can only be run on ELF platforms. +if ![is_elf_format] { + return +} + +# No shared lib support on this target. +if { [istarget "mcore-*-*"] } { + return +} + +global ar +global as +global ld +global nm +global nm_output + +set test1 "ld link shared library" +set test2 "ld export symbols from archive" +set test3 "ld link shared library with --exclude-libs" +set test4 "ld exclude symbols from archive - --exclude-libs libexclude" +set test5 "ld exclude symbols from archive - --exclude-libs libexclude.a" +set test6 "ld exclude symbols from archive - --exclude-libs ALL" +set test7 "ld exclude symbols from archive - --exclude-libs foo:libexclude.a" +set test8 "ld exclude symbols from archive - --exclude-libs foo,libexclude.a" +set test9 "ld don't exclude symbols from archive - --exclude-libs foo:bar" + +if { ![ld_assemble $as $srcdir/$subdir/exclude1.s tmpdir/exclude1.o ] + || ![ld_assemble $as $srcdir/$subdir/exclude2.s tmpdir/exclude2.o] } { + unresolved $test1 + return +} + +catch "exec rm -f tmpdir/libexclude.a" catch_output +catch "exec $ar cq tmpdir/libexclude.a tmpdir/exclude2.o" catch_output +if {![string match "" $catch_output]} { + unresolved $test1 + return +} + +# Test that the symbol is normally exported. + +if { [ld_simple_link $ld tmpdir/exclude.so "--shared tmpdir/exclude1.o -Ltmpdir -lexclude"] } { + pass $test1 +} else { + if [string match "*shared not supported*" $link_output] { + unsupported "$test1 - -shared is not supported by this target" + } else { + fail $test1 + } + return +} + +if ![ld_nm $nm "-D" tmpdir/exclude.so] { + unresolved $test2 +} elseif { [info exists nm_output(exclude_sym)] } { + pass $test2 +} else { + fail $test2 +} + +# Test --exclude-libs libexclude + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs libexclude --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] } { + pass $test3 +} else { + fail $test3 +} + +if ![ld_nm $nm "-D" tmpdir/exclude.so] { + unresolved $test4 +} elseif { ! [info exists nm_output(exclude_sym)] } { + pass $test4 +} else { + fail $test4 +} + +# Test alternate spellings of --exclude-libs + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs libexclude.a --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] + && [ld_nm $nm "-D" tmpdir/exclude.so] + && ! [info exists nm_output(exclude_sym)] } { + pass $test5 +} else { + fail $test5 +} + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs ALL --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] + && [ld_nm $nm "-D" tmpdir/exclude.so] + && ! [info exists nm_output(exclude_sym)] } { + pass $test6 +} else { + fail $test6 +} + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs foo:libexclude.a --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] + && [ld_nm $nm "-D" tmpdir/exclude.so] + && ! [info exists nm_output(exclude_sym)] } { + pass $test7 +} else { + fail $test7 +} + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs foo,libexclude.a --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] + && [ld_nm $nm "-D" tmpdir/exclude.so] + && ! [info exists nm_output(exclude_sym)] } { + pass $test8 +} else { + fail $test8 +} + +if { [ld_simple_link $ld tmpdir/exclude.so "--exclude-libs foo:bar --shared tmpdir/exclude1.o -Ltmpdir -lexclude"] + && [ld_nm $nm "-D" tmpdir/exclude.so] + && [info exists nm_output(exclude_sym)] } { + pass $test9 +} else { + fail $test9 +} diff --git a/ld/testsuite/ld-elf/exclude1.s b/ld/testsuite/ld-elf/exclude1.s new file mode 100644 index 00000000000..45583a35fdf --- /dev/null +++ b/ld/testsuite/ld-elf/exclude1.s @@ -0,0 +1,3 @@ + .globl include_sym +include_sym: + .long exclude_sym - include_sym diff --git a/ld/testsuite/ld-elf/exclude2.s b/ld/testsuite/ld-elf/exclude2.s new file mode 100644 index 00000000000..401aa22a522 --- /dev/null +++ b/ld/testsuite/ld-elf/exclude2.s @@ -0,0 +1,3 @@ + .globl exclude_sym +exclude_sym: + .long 0 -- 2.30.2