This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA] Define DT_MIPS_RLD_MAP if not already defined.
On Wed, 2012-05-30 at 19:50 +0100, Pedro Alves wrote:
> On 05/30/2012 07:35 PM, Thiago Jung Bauermann wrote:
>
> > On Wed, 2012-05-30 at 19:03 +0100, Pedro Alves wrote:
> >> On 05/30/2012 05:40 AM, Thiago Jung Bauermann wrote:
> >>> Hello,
> >>>
> >>> Android doesn't support MIPS, so understandably there's no
> >>> DT_MIPS_RLD_MAP in its header files. This patch allows gdbserver to be
> >>> compiled for Android.
> >>
> >> Then why not '#ifdef DT_MIPS_RLD_MAP' out the bits that use DT_MIPS_RLD_MAP ?
> >> It's just dead code on non-MIPS ports.
> >
> > I thought #ifdef'ing platform-specific code was discouraged in GDB. I
> > can certainly do that though.
>
>
> It is, mostly in common code. But this is native code. The alternative
> is to abstract it in the linux_target_ops interface, but that's quite
> overkill for this. Plenty of other #ifdefs in linux-low.c.
What about this version then?
--
[]'s
Thiago Jung Bauermann
Linaro Toolchain Working Group
2012-05-30 Thiago Jung Bauermann <thiago.bauermann@linaro.org>
* linux-low.c (get_r_debug): Disable code using DT_MIPS_RLD_MAP
if the platform doesn't know about it.
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index c015a61..e8667ea 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -5492,6 +5492,7 @@ get_r_debug (const int pid, const int is_elf64)
if (is_elf64)
{
Elf64_Dyn *const dyn = (Elf64_Dyn *) buf;
+#ifdef DT_MIPS_RLD_MAP
union
{
Elf64_Xword map;
@@ -5507,6 +5508,7 @@ get_r_debug (const int pid, const int is_elf64)
else
break;
}
+#endif /* DT_MIPS_RLD_MAP */
if (dyn->d_tag == DT_DEBUG && map == -1)
map = dyn->d_un.d_val;
@@ -5517,6 +5519,7 @@ get_r_debug (const int pid, const int is_elf64)
else
{
Elf32_Dyn *const dyn = (Elf32_Dyn *) buf;
+#ifdef DT_MIPS_RLD_MAP
union
{
Elf32_Word map;
@@ -5532,6 +5535,7 @@ get_r_debug (const int pid, const int is_elf64)
else
break;
}
+#endif /* DT_MIPS_RLD_MAP */
if (dyn->d_tag == DT_DEBUG && map == -1)
map = dyn->d_un.d_val;