| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Fix build on aarch64/musl |
| 2 | |
| 3 | Errors |
| 4 | |
| 5 | invalid operands to binary & (have 'long double' and 'unsigned int') |
| 6 | |
| 7 | error: redefinition |
| 8 | of 'struct iovec' |
| 9 | struct iovec { void *iov_base; size_t iov_len; }; |
| 10 | ^ |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | Index: elfutils-0.163/backends/aarch64_initreg.c |
| 14 | =================================================================== |
| 15 | --- elfutils-0.163.orig/backends/aarch64_initreg.c |
| 16 | +++ elfutils-0.163/backends/aarch64_initreg.c |
| 17 | @@ -33,7 +33,7 @@ |
| 18 | #include "system.h" |
| 19 | #include <assert.h> |
| 20 | #ifdef __aarch64__ |
| 21 | -# include <linux/uio.h> |
| 22 | +# include <sys/uio.h> |
| 23 | # include <sys/user.h> |
| 24 | # include <sys/ptrace.h> |
| 25 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ |
| 26 | @@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t |
| 27 | |
| 28 | Dwarf_Word dwarf_fregs[32]; |
| 29 | for (int r = 0; r < 32; r++) |
| 30 | - dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; |
| 31 | + dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; |
| 32 | |
| 33 | if (! setfunc (64, 32, dwarf_fregs, arg)) |
| 34 | return false; |
| 35 | Index: elfutils-0.163/backends/arm_initreg.c |
| 36 | =================================================================== |
| 37 | --- elfutils-0.163.orig/backends/arm_initreg.c |
| 38 | +++ elfutils-0.163/backends/arm_initreg.c |
| 39 | @@ -37,7 +37,7 @@ |
| 40 | #endif |
| 41 | |
| 42 | #ifdef __aarch64__ |
| 43 | -# include <linux/uio.h> |
| 44 | +# include <sys/uio.h> |
| 45 | # include <sys/user.h> |
| 46 | # include <sys/ptrace.h> |
| 47 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ |