aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog2
-rw-r--r--ld/ldmain.c13
2 files changed, 13 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1935b27..8d11623 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,7 @@
Fri Mar 10 14:43:48 1995 Ian Lance Taylor <ian@cygnus.com>
+ * ldmain.c (main): Don't set EXEC_P if link_info.shared is set.
+
* ldlex.l: Return -lFILENAME as the token LNAME.
* ldgram.y: Add token LNAME.
(input_list): Treat LNAME like NAME, but pass it to
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 091f776..5c534a4 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -228,7 +228,16 @@ main (argc, argv)
if (isfile)
ldfile_open_command_file (s);
else
- lex_redirect (s);
+ {
+ if (trace_file_tries)
+ {
+ info_msg ("using internal linker script:\n");
+ info_msg ("==================================================\n");
+ info_msg (s);
+ info_msg ("\n==================================================\n");
+ }
+ lex_redirect (s);
+ }
parser_input = input_script;
yyparse ();
}
@@ -285,7 +294,7 @@ main (argc, argv)
}
}
- if (link_info.relocateable)
+ if (link_info.relocateable || link_info.shared)
output_bfd->flags &= ~EXEC_P;
else
output_bfd->flags |= EXEC_P;