diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-13 20:46:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-13 20:46:13 +0000 |
| commit | 881fbbd4d3521d3d450fc8fda15708cd18eb0a65 (patch) | |
| tree | 29f13b7a94cb568ff94ac5ec43cfc898889ff2cc /sys-boot/cromwell/files | |
| parent | drop cromwell mask now that it works with gcc-4.6 (diff) | |
| download | gentoo-2-881fbbd4d3521d3d450fc8fda15708cd18eb0a65.tar.gz gentoo-2-881fbbd4d3521d3d450fc8fda15708cd18eb0a65.tar.bz2 gentoo-2-881fbbd4d3521d3d450fc8fda15708cd18eb0a65.zip | |
Update to EAPI=4 and fix linking with newer gcc versions #363535 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/cromwell/files')
| -rw-r--r-- | sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch b/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch new file mode 100644 index 000000000000..92de3b014b61 --- /dev/null +++ b/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch @@ -0,0 +1,39 @@ +newer gcc versions will output .text.unlikely which this linker script +doesn't expect + +https://bugs.gentoo.org/363535 + +--- a/scripts/ldscript-crom.ld ++++ b/scripts/ldscript-crom.ld +@@ -21,7 +21,7 @@ SECTIONS { + + .text LOW_ROM : AT ( 0 ){ + _start_low_rom = . ; +- *(.text); ++ *(.text .text.*); + _end_low_rom = . ; + } + +@@ -67,4 +67,5 @@ SECTIONS { + + _end_complete_rom = SIZEOF(.text) + SIZEOF(.rodata) + SIZEOF(.data) + SIZEOF(.bss); + ++ /DISCARD/ : { *(.eh_frame) } + } +--- a/boot_rom/bootrom.ld ++++ b/boot_rom/bootrom.ld +@@ -31,7 +31,7 @@ SECTIONS { + .text (RAM_CODE) : AT( SIZEOF(.low_rom) ) { + _ram_location = .; + _start_ramcopy = _end_rom; +- *(.text); ++ *(.text .text.*); + _start_checksum = _start_ramcopy - LOW_ROM; + } + +@@ -74,4 +74,5 @@ SECTIONS { + } = 0x90909090 + */ + ++ /DISCARD/ : { *(.eh_frame) } + } |