propagate from branch 'com.redhat.elfutils' (head fdd0e4957136e12a03ac29445d116d7fcf6fdd02)

            to branch 'com.redhat.elfutils.roland.pending' (head ba30c6e5cab6b9316a77ed1c6e8353c0bab892ac)

1 files changed, 2 insertions, 2 deletions

diff --git a/libelf/elf_getaroff.c b/libelf/elf_getaroff.c
index f8b426e7..8dea0614 100644
--- a/libelf/elf_getaroff.c
+++ b/libelf/elf_getaroff.c
@@ -1,5 +1,5 @@
 /* Return offset in archive for current file ELF.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2008 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -71,5 +71,5 @@ elf_getaroff (elf)
   Elf *parent = elf->parent;
   assert (parent->kind == ELF_K_AR);
 
-  return parent->state.ar.offset;
+  return elf->start_offset - sizeof (struct ar_hdr) - parent->start_offset;
 }