diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sysdeps/generic/unwind-dw2-fde-glibc.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dc6704421e..4a6eee20a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-11-22 Joseph Myers <joseph@codesourcery.com> + * sysdeps/generic/unwind-dw2-fde-glibc.c + (_Unwind_IteratePhdrCallback): Declare P_DYNAMIC with + __attribute__ ((unused)). + [BZ #14645] * sysdeps/ieee754/ldbl-128ibm/s_fmal.c (__fmal): Compute result as x * y if x and y are nonzero and z is zero. diff --git a/sysdeps/generic/unwind-dw2-fde-glibc.c b/sysdeps/generic/unwind-dw2-fde-glibc.c index 356428cec5..25f4c73935 100644 --- a/sysdeps/generic/unwind-dw2-fde-glibc.c +++ b/sysdeps/generic/unwind-dw2-fde-glibc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2001-2012 Free Software Foundation, Inc. Contributed by Jakub Jelinek <jakub@redhat.com>. This file is part of the GNU C Library. @@ -85,7 +85,8 @@ static int _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) { struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr; - const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic; + const ElfW(Phdr) *phdr, *p_eh_frame_hdr; + const ElfW(Phdr) *p_dynamic __attribute__ ((unused)); long n, match; _Unwind_Ptr load_base; const unsigned char *p; |