michaelh/zephyr
1
0
Fork 0
Code Releases Activity

qemu_x86_long: don't munge to elf32 in-place

Browse source 
Instead, use the QEMU_KERNEL_FILE facility to perform the
change in a new file zephyr-qemu.elf. This is what will
be sent to the emulator.

Fixes an issue where opening zephyr.elf in GDB would treat
it as a 32-bit binary instead of what it actually is,
forcing the user to override the arch setting.

Fixes: #19734

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-10-18 15:09:18 -07:00 • committed by Andrew Boie
commit beb81885c2
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmake/emu/qemu.cmake
View file

@ -236,11 +236,14 @@ endif(QEMU_PIPE_STACK)
if(CONFIG_X86_LONGMODE) if(CONFIG_X86_LONGMODE)
# QEMU doesn't like 64-bit ELF files. Since we don't use any >4GB # QEMU doesn't like 64-bit ELF files. Since we don't use any >4GB
# addresses, converting it to 32-bit is safe enough for emulation. # addresses, converting it to 32-bit is safe enough for emulation.
list(APPEND PRE_QEMU_COMMANDS set(QEMU_KERNEL_FILE "${CMAKE_BINARY_DIR}/zephyr-qemu.elf")
add_custom_target(qemu_kernel_target
COMMAND COMMAND
${CMAKE_OBJCOPY} ${CMAKE_OBJCOPY}
-O elf32-i386 -O elf32-i386
$<TARGET_FILE:${logical_target_for_zephyr_elf}> $<TARGET_FILE:${logical_target_for_zephyr_elf}>
${CMAKE_BINARY_DIR}/zephyr-qemu.elf
DEPENDS ${logical_target_for_zephyr_elf}
) )
endif() endif()