From b352d676e4ab8656a4fbae33493e5adf3a932708 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Han=20Shen=28=E6=B2=88=E6=B6=B5=29?= Date: Mon, 23 Apr 2012 08:28:12 -0600 Subject: [PATCH] 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 --- bin/mklib | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.30.2