diff options
| -rw-r--r-- | ld/ChangeLog | 15 | ||||
| -rw-r--r-- | ld/ldmain.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 92622c3..c80675a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,20 @@ Mon Jul 10 13:38:28 1995 Ian Lance Taylor <ian@cygnus.com> + Based on patches from H.J. Lu <hjl@nynexst.com>: + * ldlang.h (lang_input_statement_type): Add new field dynamic. + * ldlang.c (new_afile): Set dynamic from config.dynamic_link. + * ldfile.c: Include bfdlink.h. + (ldfile_open_file): Check dynamic field of entry, not global + dynamic_link field. Don't do a dynamic search when doing a + relocateable link. + * ldmain.c (main): Don't warn about dynamic_link for a + relocateable link. + * emultempl/sunos.em (gld${EMULATION_NAME}_find_so): Skip file if + dynamic is false. + (gld${EMULATION_NAME}_create_output_section_statements): Always + loop over input files. + * Makefile.in: Rebuild dependencies. + * ld.texinfo, ld.1: Document -Bstatic, -Bdynamic, -Bshared, and -shared. diff --git a/ld/ldmain.c b/ld/ldmain.c index c3f531d..55049d7 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -220,8 +220,6 @@ main (argc, argv) { if (command_line.relax) einfo ("%P%F: -relax and -r may not be used together\n"); - if (config.dynamic_link) - einfo ("%P%F: -r and -call_shared may not be used together\n"); if (link_info.shared) einfo ("%P%F: -r and -shared may not be used together\n"); } |