summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2010-02-13 13:36:55 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2010-02-13 13:36:55 +0000
commit59ec84e6bdc758158a5043cce90320ceab786eb7 (patch)
tree11f778d7c6fb01a2548027cef6f9c2a9f8e12e35
parent1f7c8203fe01165c0e4fd04f37c42bfc92013dc3 (diff)
downloadgdb-59ec84e6bdc758158a5043cce90320ceab786eb7.tar.gz
gdb/
* solib-svr4.c: (LM_ADDR_CHECK): Move variable align to a more inner block.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/solib-svr4.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c66b928fb62..5181d4def98 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2010-02-13 Jan Kratochvil <jan.kratochvil@redhat.com>
+ * solib-svr4.c: (LM_ADDR_CHECK): Move variable align to a more inner
+ block.
+
+2010-02-13 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* 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 ef32f46348b..ae3f49ac85b 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;