x32 and libtool fixes

This commit is contained in:
Anthony Green
2013-02-07 15:47:01 -05:00
parent 95eecebb28
commit ffef2e046a
4 changed files with 26 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
2013-02-07 Daniel Schepler <dschepler@gmail.com>
* configure.ac: Correctly identify x32 systems as 64-bit.
* m4/libtool.m4: Remove libtool expr error.
* aclocal.m4, configure: Rebuilt.
2013-02-07 Anthony Green <green@moxielogic.com> 2013-02-07 Anthony Green <green@moxielogic.com>
* configure.ac: Fix GCC usage test. * configure.ac: Fix GCC usage test.

12
configure vendored
View File

@@ -5361,7 +5361,8 @@ else
;; ;;
*) *)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
if test -n "$lt_cv_sys_max_cmd_len"; then if test -n "$lt_cv_sys_max_cmd_len" && \
test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else else
@@ -13385,7 +13386,14 @@ case "$host" in
i?86-*-* | x86_64-*-*) i?86-*-* | x86_64-*-*)
TARGETDIR=x86 TARGETDIR=x86
if test $ac_cv_sizeof_size_t = 4; then if test $ac_cv_sizeof_size_t = 4; then
TARGET=X86; case "$host" in
*-gnux32)
TARGET=X86_64
;;
*)
TARGET=X86
;;
esac
else else
TARGET=X86_64; TARGET=X86_64;
fi fi

View File

@@ -166,7 +166,14 @@ case "$host" in
i?86-*-* | x86_64-*-*) i?86-*-* | x86_64-*-*)
TARGETDIR=x86 TARGETDIR=x86
if test $ac_cv_sizeof_size_t = 4; then if test $ac_cv_sizeof_size_t = 4; then
TARGET=X86; case "$host" in
*-gnux32)
TARGET=X86_64
;;
*)
TARGET=X86
;;
esac
else else
TARGET=X86_64; TARGET=X86_64;
fi fi

3
m4/libtool.m4 vendored
View File

@@ -1695,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;; ;;
*) *)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
if test -n "$lt_cv_sys_max_cmd_len"; then if test -n "$lt_cv_sys_max_cmd_len" && \
test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else else