aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1995-07-10 21:16:40 +0000
committerIan Lance Taylor <ian@airs.com>1995-07-10 21:16:40 +0000
commit7213def760558d19c934ebd3175577dce3580846 (patch)
treea2924c33d60003b7a242d32f6464d52700b19eba /ld
parentdb8e56dc1399e3bdf7f3c7417a5644002005e62f (diff)
downloadgdb-7213def760558d19c934ebd3175577dce3580846.zip
gdb-7213def760558d19c934ebd3175577dce3580846.tar.gz
gdb-7213def760558d19c934ebd3175577dce3580846.tar.bz2
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.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog15
-rw-r--r--ld/ldmain.c2
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");
}