diff options
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.27.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc index af1420b247..fc81721f80 100644 --- a/meta/recipes-devtools/binutils/binutils-2.27.inc +++ b/meta/recipes-devtools/binutils/binutils-2.27.inc | |||
@@ -36,6 +36,7 @@ SRC_URI = "\ | |||
36 | file://0014-libtool-remove-rpath.patch \ | 36 | file://0014-libtool-remove-rpath.patch \ |
37 | file://0015-binutils-mips-gas-pic-relax-linkonce.diff \ | 37 | file://0015-binutils-mips-gas-pic-relax-linkonce.diff \ |
38 | file://0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch \ | 38 | file://0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch \ |
39 | file://0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch \ | ||
39 | " | 40 | " |
40 | S = "${WORKDIR}/git" | 41 | S = "${WORKDIR}/git" |
41 | 42 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch b/meta/recipes-devtools/binutils/binutils/0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch new file mode 100644 index 0000000000..33bf1e8f65 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 72b09de92cc597c53b1d762882b67a17fe56846c Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Tue, 23 Aug 2016 09:45:11 +0100 | ||
4 | Subject: [PATCH 16/16] Fix seg-fault in ARM linker when trying to parse a | ||
5 | binary file. | ||
6 | |||
7 | * elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if | ||
8 | there is no arm data associated with the section. | ||
9 | --- | ||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | bfd/elf32-arm.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c | ||
17 | index 700bec3..3fab609 100644 | ||
18 | --- a/bfd/elf32-arm.c | ||
19 | +++ b/bfd/elf32-arm.c | ||
20 | @@ -18207,7 +18207,7 @@ elf32_arm_count_additional_relocs (asection *sec) | ||
21 | { | ||
22 | struct _arm_elf_section_data *arm_data; | ||
23 | arm_data = get_arm_elf_section_data (sec); | ||
24 | - return arm_data->additional_reloc_count; | ||
25 | + return arm_data == NULL ? 0 : arm_data->additional_reloc_count; | ||
26 | } | ||
27 | |||
28 | /* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which | ||
29 | -- | ||
30 | 2.10.1 | ||
31 | |||