diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2004-10-11 02:40:47 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2004-10-11 02:40:47 +0000 |
| commit | f39d3190a3b59a5e33ac666bb4fc38e50d1cd76c (patch) | |
| tree | b2017f3791feeec8cd3b09029b169f5bedd53211 /ld/ldfile.c | |
| parent | 7ce192ace93f1f2bd1591a73e201ced599342a1a (diff) | |
| download | binutils-redhat-f39d3190a3b59a5e33ac666bb4fc38e50d1cd76c.tar.gz | |
PR 423
* ldfile.c (ldfile_try_open_bfd): Ensure dynamic objects are
rejected when linking statically.
Diffstat (limited to 'ld/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index e7a7d8cec0..25d53e0358 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -151,9 +151,10 @@ ldfile_try_open_bfd (const char *attempt, /* If we are searching for this file, see if the architecture is compatible with the output file. If it isn't, keep searching. If we can't open the file as an object file, stop the search - here. */ + here. If we are statically linking, ensure that we don't link + a dynamic object. */ - if (entry->search_dirs_flag) + if (entry->search_dirs_flag || !entry->dynamic) { bfd *check; @@ -167,6 +168,7 @@ ldfile_try_open_bfd (const char *attempt, if (! bfd_check_format (check, bfd_object)) { if (check == entry->the_bfd + && entry->search_dirs_flag && bfd_get_error () == bfd_error_file_not_recognized && ! ldemul_unrecognized_file (entry)) { @@ -260,8 +262,18 @@ ldfile_try_open_bfd (const char *attempt, return TRUE; } - if ((bfd_arch_get_compatible (check, output_bfd, - command_line.accept_unknown_input_arch) == NULL) + if (!entry->dynamic && (entry->the_bfd->flags & DYNAMIC) != 0) + { + einfo (_("%F%P: attempted static link of dynamic object `%s'\n"), + attempt); + bfd_close (entry->the_bfd); + entry->the_bfd = NULL; + return FALSE; + } + + if (entry->search_dirs_flag + && !bfd_arch_get_compatible (check, output_bfd, + command_line.accept_unknown_input_arch) /* XCOFF archives can have 32 and 64 bit objects. */ && ! (bfd_get_flavour (check) == bfd_target_xcoff_flavour && bfd_get_flavour (output_bfd) == bfd_target_xcoff_flavour |