diff options
author | Yu Ning <yu.ning@intel.com> | 2015-07-13 17:17:04 +0800 |
---|---|---|
committer | Yu Ning <yu.ning@intel.com> | 2015-07-13 19:45:40 +0800 |
commit | da066f54a0a41cf90bb0b27753dcefeb172c010c (patch) | |
tree | dfba92be32efca957f74d9962e4e0f2477491de1 | |
parent | 20349dae98d7de09a7e390d4a706c64f1db6edc2 (diff) | |
download | qemu-pc-bios-da066f54a0a41cf90bb0b27753dcefeb172c010c.tar.gz |
bochs/bios: Fix build
Currently, this project does not build on Ubuntu. "make" fails in the
bochs/bios/ directory with the following error:
ld -o rombios32.out -T ./rombios32.ld rombios32start.o rombios32.o
ld: section .eh_frame loaded at [00000000000e3e40,00000000000e453f]
overlaps section .data loaded at [00000000000e3e40,00000000000e3e43]
make[1]: *** [rombios32.out] Error 1
Build environment:
- Ubuntu 14.04 x86_64
- gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
- GNU ld (GNU Binutils for Ubuntu) 2.24
Back-porting the following patch from the upstream Bochs codebase fixes
this issue:
------------------------------------------------------------------------
r11179 | vruppert | 2012-05-13 06:25:09 +0800 (Sun, 13 May 2012) [1]
- discard "eh_frame" (compilation fix from Debian patches)
------------------------------------------------------------------------
[1] http://sourceforge.net/p/bochs/code/11179
Change-Id: Icc0d8ee4738c71e8dc02fe9e328923a4d968deac
Signed-off-by: Yu Ning <yu.ning@intel.com>
-rw-r--r-- | bochs/bios/rombios32.ld | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bochs/bios/rombios32.ld b/bochs/bios/rombios32.ld index ff765c8..fe0414a 100644 --- a/bochs/bios/rombios32.ld +++ b/bochs/bios/rombios32.ld @@ -12,6 +12,7 @@ SECTIONS /DISCARD/ : { *(.stab) *(.stabstr) *(.comment) + *(.eh_frame) *(.note) } } |