Changeset afebdc9
- Timestamp:
- Dec 31, 2008, 12:46:44 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 1d2997a1
- Parents:
- 893ca261
- Files:
-
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/introduction/common/changelog.xml
r893ca261 rafebdc9 42 42 <listitem> 43 43 <para>[Jim] - Updated Vim Patch to -3.</para> 44 </listitem> 45 <listitem> 46 <para>[Jim] - Updated Binutils Patch to -2.</para> 44 47 </listitem> 45 48 </itemizedlist> -
BOOK/patches.ent
r893ca261 rafebdc9 9 9 <!ENTITY bash-fixes-patch-size "424 KB"> 10 10 11 <!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update- 1.patch">12 <!ENTITY binutils-branch_update-patch-md5 " d8a888b40dc7a0677c007d87418221e0">13 <!ENTITY binutils-branch_update-patch-size " 38KB">11 <!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-2.patch"> 12 <!ENTITY binutils-branch_update-patch-md5 "4fb60fffba2f3a89971aac68a210b49c"> 13 <!ENTITY binutils-branch_update-patch-size "44 KB"> 14 14 15 15 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch"> -
patches/binutils-2.19-branch_update-2.patch
r893ca261 rafebdc9 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 12- 21-20082 Date: 12-30-2008 3 3 Initial Package Version: 2.19 4 4 Origin: Upstream … … 9 9 diff -Naur binutils-2.19.orig/bfd/ChangeLog binutils-2.19/bfd/ChangeLog 10 10 --- binutils-2.19.orig/bfd/ChangeLog 2008-10-16 06:20:48.000000000 -0700 11 +++ binutils-2.19/bfd/ChangeLog 2008-11-20 03:50:22.000000000 -0800 12 @@ -1,3 +1,22 @@ 11 +++ binutils-2.19/bfd/ChangeLog 2008-12-23 02:06:46.000000000 -0800 12 @@ -1,3 +1,31 @@ 13 +2008-12-23 Nick Clifton <nickc@redhat.com> 14 + 15 + * Import this patch from the mainline: 16 + 2008-11-10 Andreas Schwab <schwab@suse.de> 17 + 18 + PR 7011 19 + * elf.c (assign_file_positions_for_non_load_sections): Handle 20 + PT_GNU_RELRO specially. 21 + 13 22 +2008-11-20 Alan Modra <amodra@bigpond.net.au> 14 23 + … … 35 44 diff -Naur binutils-2.19.orig/bfd/Makefile.in binutils-2.19/bfd/Makefile.in 36 45 --- binutils-2.19.orig/bfd/Makefile.in 2008-10-16 06:20:48.000000000 -0700 37 +++ binutils-2.19/bfd/Makefile.in 2008-12- 21 01:24:46.000000000 -080046 +++ binutils-2.19/bfd/Makefile.in 2008-12-30 16:34:28.000000000 -0800 38 47 @@ -271,7 +271,7 @@ 39 48 ACLOCAL_AMFLAGS = -I . -I .. -I ../config … … 69 78 dnl These must be called before LT_INIT, because it may want 70 79 dnl to call AC_CHECK_PROG. 80 diff -Naur binutils-2.19.orig/bfd/elf.c binutils-2.19/bfd/elf.c 81 --- binutils-2.19.orig/bfd/elf.c 2008-10-09 05:18:23.000000000 -0700 82 +++ binutils-2.19/bfd/elf.c 2008-12-23 02:06:46.000000000 -0800 83 @@ -4606,7 +4606,61 @@ 84 m != NULL; 85 m = m->next, p++) 86 { 87 - if (m->count != 0) 88 + if (p->p_type == PT_GNU_RELRO) 89 + { 90 + const Elf_Internal_Phdr *lp; 91 + 92 + BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs); 93 + 94 + if (link_info != NULL) 95 + { 96 + /* During linking the range of the RELRO segment is passed 97 + in link_info. */ 98 + for (lp = phdrs; lp < phdrs + count; ++lp) 99 + { 100 + if (lp->p_type == PT_LOAD 101 + && lp->p_vaddr >= link_info->relro_start 102 + && lp->p_vaddr < link_info->relro_end 103 + && lp->p_vaddr + lp->p_filesz >= link_info->relro_end) 104 + break; 105 + } 106 + } 107 + else 108 + { 109 + /* Otherwise we are copying an executable or shared 110 + library, but we need to use the same linker logic. */ 111 + for (lp = phdrs; lp < phdrs + count; ++lp) 112 + { 113 + if (lp->p_type == PT_LOAD 114 + && lp->p_paddr == p->p_paddr) 115 + break; 116 + } 117 + } 118 + 119 + if (lp < phdrs + count) 120 + { 121 + p->p_vaddr = lp->p_vaddr; 122 + p->p_paddr = lp->p_paddr; 123 + p->p_offset = lp->p_offset; 124 + if (link_info != NULL) 125 + p->p_filesz = link_info->relro_end - lp->p_vaddr; 126 + else if (m->p_size_valid) 127 + p->p_filesz = m->p_size; 128 + else 129 + abort (); 130 + p->p_memsz = p->p_filesz; 131 + p->p_align = 1; 132 + p->p_flags = (lp->p_flags & ~PF_W); 133 + } 134 + else if (link_info != NULL) 135 + { 136 + memset (p, 0, sizeof *p); 137 + p->p_type = PT_NULL; 138 + } 139 + else 140 + abort (); 141 + } 142 + else if (m->count != 0) 143 { 144 if (p->p_type != PT_LOAD 145 && (p->p_type != PT_NOTE 146 @@ -4622,87 +4676,20 @@ 147 p->p_filesz = sect->filepos - m->sections[0]->filepos; 148 if (hdr->sh_type != SHT_NOBITS) 149 p->p_filesz += hdr->sh_size; 150 - 151 - if (p->p_type == PT_GNU_RELRO) 152 - { 153 - /* When we get here, we are copying executable 154 - or shared library. But we need to use the same 155 - linker logic. */ 156 - Elf_Internal_Phdr *lp; 157 - 158 - for (lp = phdrs; lp < phdrs + count; ++lp) 159 - { 160 - if (lp->p_type == PT_LOAD 161 - && lp->p_paddr == p->p_paddr) 162 - break; 163 - } 164 - 165 - if (lp < phdrs + count) 166 - { 167 - /* We should use p_size if it is valid since it 168 - may contain the first few bytes of the next 169 - SEC_ALLOC section. */ 170 - if (m->p_size_valid) 171 - p->p_filesz = m->p_size; 172 - else 173 - abort (); 174 - p->p_vaddr = lp->p_vaddr; 175 - p->p_offset = lp->p_offset; 176 - p->p_memsz = p->p_filesz; 177 - p->p_align = 1; 178 - } 179 - else 180 - abort (); 181 - } 182 - else 183 - p->p_offset = m->sections[0]->filepos; 184 + p->p_offset = m->sections[0]->filepos; 185 } 186 } 187 - else 188 + else if (m->includes_filehdr) 189 { 190 - if (m->includes_filehdr) 191 - { 192 - p->p_vaddr = filehdr_vaddr; 193 - if (! m->p_paddr_valid) 194 - p->p_paddr = filehdr_paddr; 195 - } 196 - else if (m->includes_phdrs) 197 - { 198 - p->p_vaddr = phdrs_vaddr; 199 - if (! m->p_paddr_valid) 200 - p->p_paddr = phdrs_paddr; 201 - } 202 - else if (p->p_type == PT_GNU_RELRO) 203 - { 204 - Elf_Internal_Phdr *lp; 205 - 206 - for (lp = phdrs; lp < phdrs + count; ++lp) 207 - { 208 - if (lp->p_type == PT_LOAD 209 - && lp->p_vaddr <= link_info->relro_end 210 - && lp->p_vaddr >= link_info->relro_start 211 - && (lp->p_vaddr + lp->p_filesz 212 - >= link_info->relro_end)) 213 - break; 214 - } 215 - 216 - if (lp < phdrs + count 217 - && link_info->relro_end > lp->p_vaddr) 218 - { 219 - p->p_vaddr = lp->p_vaddr; 220 - p->p_paddr = lp->p_paddr; 221 - p->p_offset = lp->p_offset; 222 - p->p_filesz = link_info->relro_end - lp->p_vaddr; 223 - p->p_memsz = p->p_filesz; 224 - p->p_align = 1; 225 - p->p_flags = (lp->p_flags & ~PF_W); 226 - } 227 - else 228 - { 229 - memset (p, 0, sizeof *p); 230 - p->p_type = PT_NULL; 231 - } 232 - } 233 + p->p_vaddr = filehdr_vaddr; 234 + if (! m->p_paddr_valid) 235 + p->p_paddr = filehdr_paddr; 236 + } 237 + else if (m->includes_phdrs) 238 + { 239 + p->p_vaddr = phdrs_vaddr; 240 + if (! m->p_paddr_valid) 241 + p->p_paddr = phdrs_paddr; 242 } 243 } 244 71 245 diff -Naur binutils-2.19.orig/bfd/elf32-avr.c binutils-2.19/bfd/elf32-avr.c 72 246 --- binutils-2.19.orig/bfd/elf32-avr.c 2008-08-08 22:35:12.000000000 -0700 … … 230 404 diff -Naur binutils-2.19.orig/bfd/version.h binutils-2.19/bfd/version.h 231 405 --- binutils-2.19.orig/bfd/version.h 2008-10-16 05:51:57.000000000 -0700 232 +++ binutils-2.19/bfd/version.h 2008-12- 19 16:00:10.000000000 -0800406 +++ binutils-2.19/bfd/version.h 2008-12-30 16:00:14.000000000 -0800 233 407 @@ -1,4 +1,4 @@ 234 408 -#define BFD_VERSION_DATE 20081016 235 +#define BFD_VERSION_DATE 200812 20409 +#define BFD_VERSION_DATE 20081231 236 410 #define BFD_VERSION @bfd_version@ 237 411 #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ … … 239 413 diff -Naur binutils-2.19.orig/binutils/ChangeLog binutils-2.19/binutils/ChangeLog 240 414 --- binutils-2.19.orig/binutils/ChangeLog 2008-10-02 01:07:16.000000000 -0700 241 +++ binutils-2.19/binutils/ChangeLog 2008-12-01 02:05:34.000000000 -0800 242 @@ -1,3 +1,11 @@ 415 +++ binutils-2.19/binutils/ChangeLog 2008-12-23 03:49:58.000000000 -0800 416 @@ -1,3 +1,16 @@ 417 +2008-12-23 Nick Clifton <nickc@redhat.com> 418 + 419 + * windmc.c (main): Use correct type for file length. 420 + * dlltool.c (gen_exp_file): Likewise. 421 + 243 422 +2008-12-01 Nick Clifton <nickc@redhat.com> 244 423 + … … 254 433 diff -Naur binutils-2.19.orig/binutils/dlltool.c binutils-2.19/binutils/dlltool.c 255 434 --- binutils-2.19.orig/binutils/dlltool.c 2008-07-29 21:34:56.000000000 -0700 256 +++ binutils-2.19/binutils/dlltool.c 2008-12- 01 02:05:34.000000000 -0800435 +++ binutils-2.19/binutils/dlltool.c 2008-12-23 03:49:58.000000000 -0800 257 436 @@ -1206,7 +1206,7 @@ 258 437 … … 264 443 fatal (errmsg_fmt, errmsg_arg); 265 444 } 445 @@ -1980,7 +1980,7 @@ 446 int addr; 447 long need[PAGE_SIZE]; 448 long page_addr; 449 - int numbytes; 450 + bfd_size_type numbytes; 451 int num_entries; 452 long *copy; 453 int j; 266 454 @@ -1992,10 +1992,10 @@ 267 455 numbytes = ftell (base_file); … … 279 467 diff -Naur binutils-2.19.orig/binutils/windmc.c binutils-2.19/binutils/windmc.c 280 468 --- binutils-2.19.orig/binutils/windmc.c 2008-07-29 21:34:56.000000000 -0700 281 +++ binutils-2.19/binutils/windmc.c 2008-12-01 02:05:34.000000000 -0800 469 +++ binutils-2.19/binutils/windmc.c 2008-12-23 03:49:58.000000000 -0800 470 @@ -1144,7 +1144,7 @@ 471 unichar *u; 472 rc_uint_type ul; 473 char *buff; 474 - long flen; 475 + bfd_size_type flen; 476 FILE *fp = fopen (input_filename, "rb"); 477 478 if (!fp) 282 479 @@ -1155,7 +1155,8 @@ 283 480 fseek (fp, 0, SEEK_SET); … … 304 501 diff -Naur binutils-2.19.orig/ld/ChangeLog binutils-2.19/ld/ChangeLog 305 502 --- binutils-2.19.orig/ld/ChangeLog 2008-10-09 05:18:31.000000000 -0700 306 +++ binutils-2.19/ld/ChangeLog 2008-11-13 22:55:50.000000000 -0800 307 @@ -1,3 +1,8 @@ 503 +++ binutils-2.19/ld/ChangeLog 2008-12-23 05:56:10.000000000 -0800 504 @@ -1,3 +1,13 @@ 505 +2008-12-23 Tristan Gingold <gingold@adacore.com> 506 + 507 + * Makefile.am (EXTRA_DIST): Add deffilep.c and deffilep.h 508 + * Makefile.in: Regenerate. 509 + 308 510 +2008-11-14 Alan Modra <amodra@bigpond.net.au> 309 511 + … … 316 518 diff -Naur binutils-2.19.orig/ld/Makefile.am binutils-2.19/ld/Makefile.am 317 519 --- binutils-2.19.orig/ld/Makefile.am 2008-09-09 01:02:19.000000000 -0700 318 +++ binutils-2.19/ld/Makefile.am 2008-1 1-13 22:55:50.000000000 -0800520 +++ binutils-2.19/ld/Makefile.am 2008-12-23 05:56:10.000000000 -0800 319 521 @@ -758,9 +758,9 @@ 320 522 $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S … … 329 531 eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \ 330 532 $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} 533 @@ -1914,7 +1914,8 @@ 534 535 # Stuff that should be included in a distribution. The diststuff 536 # target is run by the taz target in ../Makefile.in. 537 -EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c $(man_MANS) 538 +EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c \ 539 + deffilep.c deffilep.h $(man_MANS) 540 diststuff: info $(EXTRA_DIST) 541 all: info ld.1 542 331 543 diff -Naur binutils-2.19.orig/ld/Makefile.in binutils-2.19/ld/Makefile.in 332 544 --- binutils-2.19.orig/ld/Makefile.in 2008-09-09 01:02:19.000000000 -0700 333 +++ binutils-2.19/ld/Makefile.in 2008-11-13 22:55:50.000000000 -0800 334 @@ -1588,9 +1588,9 @@ 545 +++ binutils-2.19/ld/Makefile.in 2008-12-23 05:56:10.000000000 -0800 546 @@ -730,7 +730,9 @@ 547 548 # Stuff that should be included in a distribution. The diststuff 549 # target is run by the taz target in ../Makefile.in. 550 -EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c $(man_MANS) 551 +EXTRA_DIST = ldgram.c ldgram.h ldlex.c emultempl/spu_ovl.o_c \ 552 + deffilep.c deffilep.h $(man_MANS) 553 + 554 DISTCLEANFILES = tdirs site.exp site.bak stringify.sed $(am__append_1) 555 all: config.h 556 $(MAKE) $(AM_MAKEFLAGS) all-recursive 557 @@ -1588,9 +1590,9 @@ 335 558 $(srcdir)/emultempl/spu_ovl.o_c: @MAINT@ $(srcdir)/emultempl/spu_ovl.S 336 559 if ../gas/as-new --version \
Note:
See TracChangeset
for help on using the changeset viewer.