aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/lexsup.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3f53f13..d1b819b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-29 H.J. Lu <hongjiu.lu@intel.com>
+
+ * lexsup.c (parse_args): Don't set link_info.executable to
+ TRUE for link_info.relocatable.
+
2015-07-27 H.J. Lu <hongjiu.lu@intel.com>
* configure: Regenerated.
diff --git a/ld/lexsup.c b/ld/lexsup.c
index b884d9a..0aa67f5 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1578,7 +1578,7 @@ parse_args (unsigned argc, char **argv)
einfo (_("%P%F: -f may not be used without -shared\n"));
}
- if (! link_info.shared || link_info.pie)
+ if ((! link_info.shared && ! link_info.relocatable) || link_info.pie)
link_info.executable = TRUE;
/* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I