diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils-2.23.1/backport/0024-bfd.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.23.1/backport/0024-bfd.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0024-bfd.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0024-bfd.patch deleted file mode 100644 index f50c2ec075..0000000000 --- a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0024-bfd.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From f9fd8f72b070bfdc49c957f3968e6fcec34b57fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Roland McGrath <roland@gnu.org> | ||
3 | Date: Mon, 26 Nov 2012 17:50:04 +0000 | ||
4 | Subject: [PATCH 24/27] bfd/ * elf-nacl.c (nacl_modify_segment_map): Don't | ||
5 | crash when INFO is null. | ||
6 | |||
7 | --- | ||
8 | bfd/ChangeLog | 4 ++++ | ||
9 | bfd/elf-nacl.c | 5 ++--- | ||
10 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/bfd/ChangeLog b/bfd/ChangeLog | ||
13 | index cf65838..5500b36 100644 | ||
14 | --- a/bfd/ChangeLog | ||
15 | +++ b/bfd/ChangeLog | ||
16 | @@ -1,3 +1,7 @@ | ||
17 | +2012-11-26 Roland McGrath <mcgrathr@google.com> | ||
18 | + | ||
19 | + * elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null. | ||
20 | + | ||
21 | 2012-11-21 Roland McGrath <mcgrathr@google.com> | ||
22 | |||
23 | * elf-nacl.c (segment_nonexecutable_and_has_contents): Renamed to ... | ||
24 | diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c | ||
25 | index 04659e7..ce401fa 100644 | ||
26 | --- a/bfd/elf-nacl.c | ||
27 | +++ b/bfd/elf-nacl.c | ||
28 | @@ -75,7 +75,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) | ||
29 | struct elf_segment_map **first_load = NULL; | ||
30 | struct elf_segment_map **last_load = NULL; | ||
31 | bfd_boolean moved_headers = FALSE; | ||
32 | - int sizeof_headers = bfd_sizeof_headers (abfd, info); | ||
33 | + int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info); | ||
34 | bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize; | ||
35 | |||
36 | if (info != NULL && info->user_phdrs) | ||
37 | @@ -149,8 +149,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) | ||
38 | proper order for the ELF rule that they must appear in ascending address | ||
39 | order. So find the two segments we swapped before, and swap them back. */ | ||
40 | bfd_boolean | ||
41 | -nacl_modify_program_headers (bfd *abfd, | ||
42 | - struct bfd_link_info *info ATTRIBUTE_UNUSED) | ||
43 | +nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info) | ||
44 | { | ||
45 | struct elf_segment_map **m = &elf_tdata (abfd)->segment_map; | ||
46 | Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr; | ||
47 | -- | ||
48 | 1.7.9.5 | ||
49 | |||