Replace using of objdump with elfdump
In-tree objdump is too old to dump new ELF headers. But for example if we use: `make CROSS_TOOLCHAIN=riscv64-gcc TARGET_ARCH=riscv64` and do not specify CROSS_BINUTILS_PREFIX in env, embed_mfs.sh cannot find the correct objdump. This patch just replaces using of objdump with elfdump to collect needed information. Later we may also put an ELFDUMP in CROSSENV and use it in embed_mfs.sh . Reviewed by: emaste, br MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D9062
This commit is contained in:
parent
c70c4d71de
commit
0a50238935
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=311881
@ -36,12 +36,12 @@ mfs_size=`stat -f '%z' $2 2> /dev/null`
|
||||
# If we can't determine MFS image size - bail.
|
||||
[ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1
|
||||
|
||||
sec_info=`${CROSS_BINUTILS_PREFIX}objdump -h $1 2> /dev/null | grep " oldmfs "`
|
||||
sec_info=`elfdump -c $1 2> /dev/null | grep -A 5 -E "sh_name: oldmfs$"`
|
||||
# If we can't find the mfs section within the given kernel - bail.
|
||||
[ -z "${sec_info}" ] && echo "Can't locate mfs section within kernel" && exit 1
|
||||
|
||||
sec_size=`echo ${sec_info} | awk '{printf("%d", "0x" $3)}' 2> /dev/null`
|
||||
sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $6)}' 2> /dev/null`
|
||||
sec_size=`echo "${sec_info}" | awk '/sh_size/ {print $2}' 2> /dev/null`
|
||||
sec_start=`echo "${sec_info}" | awk '/sh_offset/ {print $2}' 2> /dev/null`
|
||||
|
||||
# If the mfs section size is smaller than the mfs image - bail.
|
||||
[ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user