X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bin%2Fmklib;h=9bac29ea85924af510bbbe2a53cd3ef207a3e4bc;hb=c2bae6b91de8bd023dbac7fef4c2a3b8eba28afa;hp=56e0b36d146233aa7060f55f77b0ed3461be315b;hpb=ac8a933aa81251def3b25825c9914bb895e288b8;p=mesa.git

diff --git a/bin/mklib b/bin/mklib
index 56e0b36d146..9bac29ea859 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