diff options
| author | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2009-07-19 16:22:23 -0400 |
| commit | 6568b9e34d43470336d0240fa8dbfc5122a9474e (patch) | |
| tree | 72392c0a276bde79fe4991b60081738d6e843f68 /recipes/binutils | |
| parent | ff4bd21194d38ee0b9f6892e3cae5ffc34504cad (diff) | |
| parent | 918aa5c5a17a342eaafad143cdc0ccff059e5884 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/binutils')
| -rw-r--r-- | recipes/binutils/binutils-2.18/binutils-section-in-segment.patch | 30 | ||||
| -rw-r--r-- | recipes/binutils/binutils-cross-sdk_2.17.bb | 3 | ||||
| -rw-r--r-- | recipes/binutils/binutils_2.18.bb | 3 |
3 files changed, 35 insertions, 1 deletions
diff --git a/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch b/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch new file mode 100644 index 0000000000..7e95b0a6dd --- /dev/null +++ b/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch @@ -0,0 +1,30 @@ +2007-11-28 Nathan Sidwell <nathan@codesourcery.com> + + Issue #2297 + include/elf/ + * internal.h (ELF_IS_SECTION_IN_SEGMENT): Adjust to cope with + segments at the end of memory. + +Index: include/elf/internal.h +=================================================================== +--- include/elf/internal.h (revision 187336) ++++ include/elf/internal.h (working copy) +@@ -280,11 +280,12 @@ struct elf_segment_map + || ((bfd_vma) sec_hdr->sh_offset >= segment->p_offset \ + && (sec_hdr->sh_offset + ELF_SECTION_SIZE(sec_hdr, segment) \ + <= segment->p_offset + segment->p_filesz))) \ +- /* SHF_ALLOC sections must have VMAs within the segment. */ \ ++ /* SHF_ALLOC sections must have VMAs within the segment. Be \ ++ careful about segments right at the end of memory. */ \ + && ((sec_hdr->sh_flags & SHF_ALLOC) == 0 \ + || (sec_hdr->sh_addr >= segment->p_vaddr \ +- && (sec_hdr->sh_addr + ELF_SECTION_SIZE(sec_hdr, segment) \ +- <= segment->p_vaddr + segment->p_memsz)))) ++ && (sec_hdr->sh_addr - segment->p_vaddr \ ++ + ELF_SECTION_SIZE(sec_hdr, segment) <= segment->p_memsz)))) + + /* Decide if the given sec_hdr is in the given segment in file. */ + #define ELF_IS_SECTION_IN_SEGMENT_FILE(sec_hdr, segment) \ + +--------------040206010003050401040204-- + diff --git a/recipes/binutils/binutils-cross-sdk_2.17.bb b/recipes/binutils/binutils-cross-sdk_2.17.bb new file mode 100644 index 0000000000..2f13b264a1 --- /dev/null +++ b/recipes/binutils/binutils-cross-sdk_2.17.bb @@ -0,0 +1,3 @@ +require binutils_${PV}.bb +require binutils-cross-sdk.inc +PR = "${INC_PR}.1" diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 87214644db..159d97f981 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -1,4 +1,4 @@ -INC_PR = "r6" +INC_PR = "r7" PR = "${INC_PR}.1" require binutils.inc @@ -15,6 +15,7 @@ SRC_URI = "\ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ file://binutils-uclibc-gas-needs-libm.patch;patch=1 \ file://binutils-x86_64_i386_biarch.patch;patch=1 \ + file://binutils-section-in-segment.patch;patch=1;pnum=0 \ " # powerpc patches |