jocke@1685: This patch tries to fix the issue when PTRACE_EVENT_FORK is not found in the standard
jocke@1685: system headers.  The begininngs of this was already in place in trace.c, this patch
jocke@1685: only takes that idea and puts it in a shared include file for trace.c *and* events.c.
jocke@1685: The latter of which otherwise fails to build on Arm.
jocke@1685: 
jocke@1685: 	Joachim Nilsson <jocke@vmlinux.org>
jocke@1685: 
jocke@1685: diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c ltrace-0.5.3/sysdeps/linux-gnu/events.c
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c	2009-07-25 17:13:02.000000000 +0200
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/events.c	2010-01-03 14:33:46.000000000 +0100
jocke@1685: @@ -7,9 +7,8 @@
jocke@1685:  #include <errno.h>
jocke@1685:  #include <signal.h>
jocke@1685:  #include <string.h>
jocke@1685: -#include <sys/ptrace.h>
jocke@1685:  
jocke@1685: -#include "common.h"
jocke@1685: +#include "trace.h"
jocke@1685:  
jocke@1685:  static Event event;
jocke@1685:  
jocke@1685: diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c ltrace-0.5.3/sysdeps/linux-gnu/trace.c
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c	2009-07-25 17:13:02.000000000 +0200
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/trace.c	2010-01-03 14:33:38.000000000 +0100
jocke@1685: @@ -5,10 +5,9 @@
jocke@1685:  #include <unistd.h>
jocke@1685:  #include <sys/types.h>
jocke@1685:  #include <sys/wait.h>
jocke@1685: -#include "ptrace.h"
jocke@1685:  #include <asm/unistd.h>
jocke@1685:  
jocke@1685: -#include "common.h"
jocke@1685: +#include "trace.h"
jocke@1685:  
jocke@1685:  /* If the system headers did not provide the constants, hard-code the normal
jocke@1685:     values.  */
jocke@1685: diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h ltrace-0.5.3/sysdeps/linux-gnu/trace.h
jocke@1685: --- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h	1970-01-01 01:00:00.000000000 +0100
jocke@1685: +++ ltrace-0.5.3/sysdeps/linux-gnu/trace.h	2010-01-03 14:33:26.000000000 +0100
jocke@1685: @@ -0,0 +1,32 @@
jocke@1685: +/* If the system headers did not provide the constants, hard-code the normal values. */
jocke@1685: +#ifndef __SYSDEPS_TRACE_H__
jocke@1685: +#define __SYSDEPS_TRACE_H__
jocke@1685: +
jocke@1685: +#include "ptrace.h"
jocke@1685: +#include "common.h"
jocke@1685: +
jocke@1685: +#ifndef PTRACE_EVENT_FORK
jocke@1685: +#warning  PTRACE_EVENT_FORK not found... redefining.
jocke@1685: +#define PTRACE_OLDSETOPTIONS    21
jocke@1685: +#define PTRACE_SETOPTIONS       0x4200
jocke@1685: +#define PTRACE_GETEVENTMSG      0x4201
jocke@1685: +
jocke@1685: +/* options set using PTRACE_SETOPTIONS */
jocke@1685: +#define PTRACE_O_TRACESYSGOOD   0x00000001
jocke@1685: +#define PTRACE_O_TRACEFORK      0x00000002
jocke@1685: +#define PTRACE_O_TRACEVFORK     0x00000004
jocke@1685: +#define PTRACE_O_TRACECLONE     0x00000008
jocke@1685: +#define PTRACE_O_TRACEEXEC      0x00000010
jocke@1685: +#define PTRACE_O_TRACEVFORKDONE 0x00000020
jocke@1685: +#define PTRACE_O_TRACEEXIT      0x00000040
jocke@1685: +
jocke@1685: +/* Wait extended result codes for the above trace options.  */
jocke@1685: +#define PTRACE_EVENT_FORK       1
jocke@1685: +#define PTRACE_EVENT_VFORK      2
jocke@1685: +#define PTRACE_EVENT_CLONE      3
jocke@1685: +#define PTRACE_EVENT_EXEC       4
jocke@1685: +#define PTRACE_EVENT_VFORK_DONE 5
jocke@1685: +#define PTRACE_EVENT_EXIT       6
jocke@1685: +
jocke@1685: +#endif /* PTRACE_EVENT_FORK */
jocke@1685: +#endif /* __SYSDEPS_TRACE_H__ */