From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-boot/cromwell/files: cromwell-2.40-gcc-4.6.patch |
Date: | Sun, 13 May 2012 20:46:22 |
Message-Id: | 20120513204613.9D1842004B@flycatcher.gentoo.org |
1 | vapier 12/05/13 20:46:13 |
2 | |
3 | Added: cromwell-2.40-gcc-4.6.patch |
4 | Log: |
5 | Update to EAPI=4 and fix linking with newer gcc versions #363535 by Diego Elio Pettenò. |
6 | |
7 | (Portage version: 2.2.0_alpha102/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: cromwell-2.40-gcc-4.6.patch |
16 | =================================================================== |
17 | newer gcc versions will output .text.unlikely which this linker script |
18 | doesn't expect |
19 | |
20 | https://bugs.gentoo.org/363535 |
21 | |
22 | --- a/scripts/ldscript-crom.ld |
23 | +++ b/scripts/ldscript-crom.ld |
24 | @@ -21,7 +21,7 @@ SECTIONS { |
25 | |
26 | .text LOW_ROM : AT ( 0 ){ |
27 | _start_low_rom = . ; |
28 | - *(.text); |
29 | + *(.text .text.*); |
30 | _end_low_rom = . ; |
31 | } |
32 | |
33 | @@ -67,4 +67,5 @@ SECTIONS { |
34 | |
35 | _end_complete_rom = SIZEOF(.text) + SIZEOF(.rodata) + SIZEOF(.data) + SIZEOF(.bss); |
36 | |
37 | + /DISCARD/ : { *(.eh_frame) } |
38 | } |
39 | --- a/boot_rom/bootrom.ld |
40 | +++ b/boot_rom/bootrom.ld |
41 | @@ -31,7 +31,7 @@ SECTIONS { |
42 | .text (RAM_CODE) : AT( SIZEOF(.low_rom) ) { |
43 | _ram_location = .; |
44 | _start_ramcopy = _end_rom; |
45 | - *(.text); |
46 | + *(.text .text.*); |
47 | _start_checksum = _start_ramcopy - LOW_ROM; |
48 | } |
49 | |
50 | @@ -74,4 +74,5 @@ SECTIONS { |
51 | } = 0x90909090 |
52 | */ |
53 | |
54 | + /DISCARD/ : { *(.eh_frame) } |
55 | } |