[PATCH] x86: Drop _X86EMU_env definition when CONFIG_BIOSEMU is used

Tom Rini trini at konsulko.com
Wed Jul 7 19:33:46 CEST 2021


On Wed, Jul 07, 2021 at 03:36:26PM +0800, Bin Meng wrote:

> With x86 we can execute an option ROM either natively or using the
> x86 emulator (if enabled with CONFIG_BIOSEMU). Both of these share
> the _X86EMU_env variable, with the native code using it to hold
> register state during interrupt processing.
> 
> At present, in 32-bit U-Boot, the variable is declared twice, once
> in common code and once in code only compiled with CONFIG_BIOSEMU.
> 
> With GCC 11 this causes a 'multiple definitions' error on boards
> with CONFIG_BIOSEMU.
> 
> Drop the emulator definition when CONFIG_BIOSEMU is used.
> 
> Signed-off-by: Bin Meng <bmeng.cn at gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210707/aaf86b36/attachment.sig>


More information about the U-Boot mailing list