jocke@1685: Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@debian.org>
jocke@1685: 
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/breakpoint.c
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/breakpoint.c
jocke@1685: @@ -6,8 +6,6 @@
jocke@1685:  #include "common.h"
jocke@1685:  #include "arch.h"
jocke@1685:  
jocke@1685: -static unsigned char break_insn[] = BREAKPOINT_VALUE;
jocke@1685: -
jocke@1685:  #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
jocke@1685:  extern void arch_enable_breakpoint(pid_t, Breakpoint *);
jocke@1685:  void
jocke@1685: @@ -20,6 +18,9 @@
jocke@1685:  	arch_enable_breakpoint(pid, sbp);
jocke@1685:  }
jocke@1685:  #else
jocke@1685: +
jocke@1685: +static unsigned char break_insn[] = BREAKPOINT_VALUE;
jocke@1685: +
jocke@1685:  void
jocke@1685:  enable_breakpoint(pid_t pid, Breakpoint *sbp) {
jocke@1685:  	unsigned int i, j;
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/arm/breakpoint.c
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/arm/breakpoint.c
jocke@1685: @@ -24,10 +24,7 @@
jocke@1685:  
jocke@1685:  #include <sys/ptrace.h>
jocke@1685:  #include "config.h"
jocke@1685: -#include "arch.h"
jocke@1685: -#include "options.h"
jocke@1685: -#include "output.h"
jocke@1685: -#include "debug.h"
jocke@1685: +#include "common.h"
jocke@1685:  
jocke@1685:  void
jocke@1685:  arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
jocke@1685: @@ -59,8 +56,6 @@
jocke@1685:  void
jocke@1685:  arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
jocke@1685:  	unsigned int i, j;
jocke@1685: -	const unsigned char break_insn[] = BREAKPOINT_VALUE;
jocke@1685: -	const unsigned char thumb_break_insn[] = THUMB_BREAKPOINT_VALUE;
jocke@1685:  
jocke@1685:  	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
jocke@1685:  
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/plt.c
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/plt.c
jocke@1685: @@ -1,4 +1,5 @@
jocke@1685:  #include <gelf.h>
jocke@1685: +#include <sys/ptrace.h>
jocke@1685:  #include "common.h"
jocke@1685:  
jocke@1685:  /* A bundle is 128 bits */
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/breakpoint.c
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/breakpoint.c
jocke@1685: @@ -6,10 +6,7 @@
jocke@1685:  
jocke@1685:  #include <sys/ptrace.h>
jocke@1685:  #include <string.h>
jocke@1685: -#include "arch.h"
jocke@1685: -#include "options.h"
jocke@1685: -#include "output.h"
jocke@1685: -#include "debug.h"
jocke@1685: +#include "common.h"
jocke@1685:  
jocke@1685:  static long long
jocke@1685:  extract_bit_field(char *bundle, int from, int len) {
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/regs.c
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/regs.c
jocke@1685: @@ -7,7 +7,6 @@
jocke@1685:  #include <asm/rse.h>
jocke@1685:  
jocke@1685:  #include <stddef.h>
jocke@1685: -#include "debug.h"
jocke@1685:  #include "common.h"
jocke@1685:  
jocke@1685:  void *