| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From e57ad47fc8549353ca80c23b9b4f38f31fde13e5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 17:27:30 +0800 |
| 4 | Subject: [PATCH 6/7] Fix build on aarch64/musl |
| 5 | |
| 6 | Errors |
| 7 | |
| 8 | invalid operands to binary & (have 'long double' and 'unsigned int') |
| 9 | |
| 10 | error: redefinition |
| 11 | of 'struct iovec' |
| 12 | struct iovec { void *iov_base; size_t iov_len; }; |
| 13 | ^ |
| 14 | Upstream-Status: Pending |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | |
| 17 | Rebase to 0.170 |
| 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 19 | --- |
| 20 | backends/aarch64_initreg.c | 4 ++-- |
| 21 | backends/arm_initreg.c | 2 +- |
| 22 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 23 | |
| 24 | diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c |
| 25 | index daf6f37..6445276 100644 |
| 26 | --- a/backends/aarch64_initreg.c |
| 27 | +++ b/backends/aarch64_initreg.c |
| 28 | @@ -33,7 +33,7 @@ |
| 29 | #include "system.h" |
| 30 | #include <assert.h> |
| 31 | #if defined(__aarch64__) && defined(__linux__) |
| 32 | -# include <linux/uio.h> |
| 33 | +# include <sys/uio.h> |
| 34 | # include <sys/user.h> |
| 35 | # include <sys/ptrace.h> |
| 36 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ |
| 37 | @@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), |
| 38 | |
| 39 | Dwarf_Word dwarf_fregs[32]; |
| 40 | for (int r = 0; r < 32; r++) |
| 41 | - dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; |
| 42 | + dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; |
| 43 | |
| 44 | if (! setfunc (64, 32, dwarf_fregs, arg)) |
| 45 | return false; |
| 46 | diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c |
| 47 | index efcabaf..062bb9e 100644 |
| 48 | --- a/backends/arm_initreg.c |
| 49 | +++ b/backends/arm_initreg.c |
| 50 | @@ -38,7 +38,7 @@ |
| 51 | #endif |
| 52 | |
| 53 | #ifdef __aarch64__ |
| 54 | -# include <linux/uio.h> |
| 55 | +# include <sys/uio.h> |
| 56 | # include <sys/user.h> |
| 57 | # include <sys/ptrace.h> |
| 58 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ |
| 59 | -- |
| 60 | 1.8.3.1 |
| 61 | |