diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch')
-rw-r--r-- | packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch b/packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch new file mode 100644 index 0000000..651230c --- /dev/null +++ b/packages/ltrace/0.5.3/0002-debian-ltrace_0.5.3-2.patch @@ -0,0 +1,86 @@ +Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@debian.org> + +--- + sysdeps/linux-gnu/arm/breakpoint.c | 7 +------ + sysdeps/linux-gnu/breakpoint.c | 5 +++-- + sysdeps/linux-gnu/ia64/breakpoint.c | 5 +---- + sysdeps/linux-gnu/ia64/plt.c | 1 + + sysdeps/linux-gnu/ia64/regs.c | 1 - + 5 files changed, 6 insertions(+), 13 deletions(-) + +--- a/sysdeps/linux-gnu/breakpoint.c ++++ b/sysdeps/linux-gnu/breakpoint.c +@@ -6,8 +6,6 @@ + #include "common.h" + #include "arch.h" + +-static unsigned char break_insn[] = BREAKPOINT_VALUE; +- + #ifdef ARCH_HAVE_ENABLE_BREAKPOINT + extern void arch_enable_breakpoint(pid_t, Breakpoint *); + void +@@ -20,6 +18,9 @@ + arch_enable_breakpoint(pid, sbp); + } + #else ++ ++static unsigned char break_insn[] = BREAKPOINT_VALUE; ++ + void + enable_breakpoint(pid_t pid, Breakpoint *sbp) { + unsigned int i, j; +--- a/sysdeps/linux-gnu/arm/breakpoint.c ++++ b/sysdeps/linux-gnu/arm/breakpoint.c +@@ -24,10 +24,7 @@ + + #include <sys/ptrace.h> + #include "config.h" +-#include "arch.h" +-#include "options.h" +-#include "output.h" +-#include "debug.h" ++#include "common.h" + + void + arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) { +@@ -59,8 +56,6 @@ + void + arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) { + unsigned int i, j; +- const unsigned char break_insn[] = BREAKPOINT_VALUE; +- const unsigned char thumb_break_insn[] = THUMB_BREAKPOINT_VALUE; + + debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr); + +--- a/sysdeps/linux-gnu/ia64/plt.c ++++ b/sysdeps/linux-gnu/ia64/plt.c +@@ -1,4 +1,5 @@ + #include <gelf.h> ++#include <sys/ptrace.h> + #include "common.h" + + /* A bundle is 128 bits */ +--- a/sysdeps/linux-gnu/ia64/breakpoint.c ++++ b/sysdeps/linux-gnu/ia64/breakpoint.c +@@ -6,10 +6,7 @@ + + #include <sys/ptrace.h> + #include <string.h> +-#include "arch.h" +-#include "options.h" +-#include "output.h" +-#include "debug.h" ++#include "common.h" + + static long long + extract_bit_field(char *bundle, int from, int len) { +--- a/sysdeps/linux-gnu/ia64/regs.c ++++ b/sysdeps/linux-gnu/ia64/regs.c +@@ -7,7 +7,6 @@ + #include <asm/rse.h> + + #include <stddef.h> +-#include "debug.h" + #include "common.h" + + void * |