From 662ef24b70042a486b270d17707eb2fe1790f4a2 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 9 Feb 2009 14:46:40 +0000 Subject: [PATCH] Missing piece of 2009-01-26 commit * ldlang.c (lang_process): Don't consider relocatable flag when checking for overlap. --- ld/ChangeLog | 8 ++++++-- ld/ldlang.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index f8f89a093f6..73020cfcd31 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2009-02-09 Nathan Sidwell + + Missing piece of 2009-01-26 commit + * ldlang.c (lang_process): Don't consider relocatable flag when + checking for overlap. + 2009-02-05 Joseph Myers * emulparams/m68kelf.sh: Add newline at end of file. @@ -45,8 +51,6 @@ * lexsup.c (parse_args): Set check_section_addresses to 1 or 0. * ld.h (args_type): Make check_section_addresses a char. - ldlang.c (lang_process): Don't consider relocatable flag when - checking for overlap. * ldmain.c (main): Default check_section_addresses to -1. Check it for relocatable links. * ld.texinfo (--check-sections): Update documentation. diff --git a/ld/ldlang.c b/ld/ldlang.c index 855e7951f4d..095bb3f0d04 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -6225,8 +6225,7 @@ lang_process (void) ldemul_finish (); /* Make sure that the section addresses make sense. */ - if (! link_info.relocatable - && command_line.check_section_addresses) + if (command_line.check_section_addresses) lang_check_section_addresses (); lang_end (); -- 2.30.2