Fix hard-float detection

On binaries built with newer toolchains, hard-float can only be
detected with readelf -h.
This commit is contained in:
Grigori Goronzy
2015-11-17 23:59:44 +01:00
parent 3d0ce93010
commit 24e781eb57

View File

@@ -92,11 +92,12 @@ function update_vc_libs {
echo " *** Updating VideoCore libraries" echo " *** Updating VideoCore libraries"
if [[ -e ${ROOT_PATH}/bin/sh ]]; then if [[ -e ${ROOT_PATH}/bin/sh ]]; then
ELFOUTPUT=$(readelf -a "${ROOT_PATH}/bin/sh") ELFOUTPUT=$(readelf -a "${ROOT_PATH}/bin/sh"; readelf -h "${ROOT_PATH}/bin/sh")
else else
ELFOUTPUT="VFP_args" ELFOUTPUT="VFP_args"
fi fi
if [[ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" ]]; then if [[ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" || \
"${ELFOUTPUT}" != "${ELFOUTPUT/hard-float/}" ]]; then
echo " *** Using HardFP libraries" echo " *** Using HardFP libraries"
cp -R "${FW_REPOLOCAL}/vc/hardfp/"* "${ROOT_PATH}/" cp -R "${FW_REPOLOCAL}/vc/hardfp/"* "${ROOT_PATH}/"
else else