From 28f34a8f2046c380bca00442d299256099495d37 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 13 Feb 2010 13:36:55 +0000 Subject: [PATCH] gdb/ * solib-svr4.c: (LM_ADDR_CHECK): Move variable align to a more inner block. --- gdb/ChangeLog | 5 +++++ gdb/solib-svr4.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c66b928..5181d4d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2010-02-13 Jan Kratochvil + * solib-svr4.c: (LM_ADDR_CHECK): Move variable align to a more inner + block. + +2010-02-13 Jan Kratochvil + * solib-svr4.c: (LM_ADDR_CHECK): Print successful prelink adjustment only if INFO_VERBOSE. diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index ef32f46..ae3f49a 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -176,7 +176,7 @@ LM_ADDR_CHECK (struct so_list *so, bfd *abfd) if (so->lm_info->l_addr == (CORE_ADDR)-1) { struct bfd_section *dyninfo_sect; - CORE_ADDR l_addr, l_dynaddr, dynaddr, align = 0x1000; + CORE_ADDR l_addr, l_dynaddr, dynaddr; l_addr = LM_ADDR_FROM_LINK_MAP (so); @@ -193,6 +193,8 @@ LM_ADDR_CHECK (struct so_list *so, bfd *abfd) if (dynaddr + l_addr != l_dynaddr) { + CORE_ADDR align = 0x1000; + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) { Elf_Internal_Ehdr *ehdr = elf_tdata (abfd)->elf_header; -- 2.7.4