diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils')
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.191.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.191.bb b/meta/recipes-devtools/elfutils/elfutils_0.191.bb index c4d872430b..76bd2b3a99 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.191.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.191.bb | |||
@@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | |||
15 | file://0001-dso-link-change.patch \ | 15 | file://0001-dso-link-change.patch \ |
16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ | 16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ |
17 | file://0003-fixheadercheck.patch \ | 17 | file://0003-fixheadercheck.patch \ |
18 | file://0006-Fix-build-on-aarch64-musl.patch \ | ||
19 | file://0001-libasm-may-link-with-libbz2-if-found.patch \ | 18 | file://0001-libasm-may-link-with-libbz2-if-found.patch \ |
20 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ | 19 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ |
21 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ | 20 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ |
diff --git a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch deleted file mode 100644 index 149e0e6a7b..0000000000 --- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 4409f128c81a9d76b9360b002a1d76043c77b53e 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] 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. */ | ||