Mesa (master): bin/mklib: remove '-m32' for arm linux

[Brian Paul]

Module: Mesa
Branch: master
Commit: b352d676e4ab8656a4fbae33493e5adf3a932708
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b352d676e4ab8656a4fbae33493e5adf3a932708

Author: Han Shen(沈涵) <shenhan at google.com>
Date:   Mon Apr 23 08:28:12 2012 -0600

bin/mklib: remove '-m32' for arm linux

-m32 is not a valid option for ARM.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 bin/mklib |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/mklib b/bin/mklib
index 56e0b36..9bac29e 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -334,7 +334,9 @@ case $ARCH in
 	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
 	    ABI32=`file $1 | grep 32-bit`
-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+	    ARM=`file $1 | grep ARM`
+	    # Do not add "-m32" option for arm.
+            if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 		OPTS="-m32 ${OPTS}"
 	    fi
 
@@ -391,7 +393,9 @@ case $ARCH in
 	    # environment.  If so, pass -m32 flag to linker.
 	    set ${OBJECTS}
 	    ABI32=`file $1 | grep 32-bit`
-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+            ARM=`file $1 | grep ARM`
+	    # Do not add "-m32" option for arm.
+            if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 		OPTS="-m32 ${OPTS}"
 	    fi
             if [ "${ALTOPTS}" ] ; then