patches/ltrace/0.5.3/140-mips.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
     2 
     3 http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
     4 
     5 Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c
     6 ===================================================================
     7 --- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:25:59.292780574 -0700
     8 +++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:26:22.671522220 -0700
     9 @@ -1,4 +1,4 @@
    10 -#include <debug.h>
    11 +#include "debug.h"
    12  #include <gelf.h>
    13  #include <sys/ptrace.h>
    14  #include "common.h"
    15 Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c
    16 ===================================================================
    17 --- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:25:59.312777529 -0700
    18 +++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:26:08.190311896 -0700
    19 @@ -4,7 +4,6 @@
    20  #include <sys/types.h>
    21  #include <sys/ptrace.h>
    22  #include <asm/ptrace.h>
    23 -#include <linux/user.h>
    24  
    25  #include "common.h"
    26  #include "mipsel.h"
    27 Index: ltrace-0.5.3/handle_event.c
    28 ===================================================================
    29 --- ltrace-0.5.3.orig/handle_event.c	2009-10-23 23:29:48.780274445 -0700
    30 +++ ltrace-0.5.3/handle_event.c	2009-10-23 23:37:32.260284055 -0700
    31 @@ -573,7 +573,8 @@ handle_breakpoint(Event *event) {
    32  			void *old_addr;
    33  			struct library_symbol *sym= event->proc->callstack[i].c_un.libfunc;
    34  			assert(sym);
    35 -			old_addr = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, sym))->addr;
    36 +			struct Breakpoint *tbp = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, sym));
    37 +			old_addr = tbp->addr;
    38  			addr=sym2addr(event->proc,sym);
    39  			assert(old_addr !=0 && addr !=0);
    40  			if(addr != old_addr){