diff options
Diffstat (limited to 'gold')
-rw-r--r-- | gold/ChangeLog | 6 | ||||
-rw-r--r-- | gold/layout.cc | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 01058c10a8..42d2d03af0 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2013-01-18 Mike Frysinger <vapier@gentoo.org> + + * layout.cc (Layout::finish_dynamic_section): Only add DT_RPATH + when enable_new_dtags is false. Only add DT_RUNPATH when + enable_new_dtags is true. + 2013-01-17 Serge Pavlov <serge.v.pavlov@gmail.com> * powerpc.cc (Stub_table::find_plt_call_entry): Make types diff --git a/gold/layout.cc b/gold/layout.cc index 576d44bee2..250782a92b 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -4647,8 +4647,9 @@ Layout::finish_dynamic_section(const Input_objects* input_objects, } } - odyn->add_string(elfcpp::DT_RPATH, rpath_val); - if (parameters->options().enable_new_dtags()) + if (!parameters->options().enable_new_dtags()) + odyn->add_string(elfcpp::DT_RPATH, rpath_val); + else odyn->add_string(elfcpp::DT_RUNPATH, rpath_val); } |