From 24e781eb57ca7abdb2fe4516896104359b8f98e5 Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@chown.ath.cx>
Date: Tue, 17 Nov 2015 23:59:44 +0100
Subject: [PATCH] Fix hard-float detection

On binaries built with newer toolchains, hard-float can only be
detected with readelf -h.
---
 rpi-update | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpi-update b/rpi-update
index d1ea461..addbbbd 100755
--- a/rpi-update
+++ b/rpi-update
@@ -92,11 +92,12 @@ function update_vc_libs {
 	echo " *** Updating VideoCore libraries"
 
 	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
 		ELFOUTPUT="VFP_args"
 	fi
-	if [[ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" ]]; then
+	if [[ "${ELFOUTPUT}" != "${ELFOUTPUT/VFP_args/}" || \
+			"${ELFOUTPUT}" != "${ELFOUTPUT/hard-float/}" ]]; then
 		echo " *** Using HardFP libraries"
 		cp -R "${FW_REPOLOCAL}/vc/hardfp/"* "${ROOT_PATH}/"
 	else