| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001 | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> | 
|  | 3 | Date: Sat, 30 Apr 2016 16:23:56 +0000 | 
|  | 4 | Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc | 
|  | 5 |  | 
|  | 6 | glibc includes the kernel header into its own header for macros | 
|  | 7 | musl does not | 
|  | 8 |  | 
|  | 9 | Upstream-Status: Pending | 
|  | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 11 |  | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 12 | --- | 
|  | 13 | ptrace.h | 8 +++++++- | 
|  | 14 | 1 file changed, 7 insertions(+), 1 deletion(-) | 
|  | 15 |  | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 16 | --- a/ptrace.h | 
|  | 17 | +++ b/ptrace.h | 
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 18 | @@ -30,7 +30,13 @@ | 
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 19 | #  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args | 
|  | 20 | # endif | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 21 |  | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 22 | +#if defined(POWERPC) && !defined(__GLIBC__) | 
|  | 23 | +#define pt_regs uapi_pt_regs | 
|  | 24 | +#endif | 
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 25 | # include <linux/ptrace.h> | 
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 26 | +#if defined(POWERPC) && !defined(__GLIBC__) | 
|  | 27 | +# undef pt_regs | 
|  | 28 | +#endif | 
|  | 29 |  | 
| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 30 | # ifdef HAVE_STRUCT_IA64_FPREG | 
|  | 31 | #  undef ia64_fpreg |