Module: wine Branch: refs/heads/master Commit: 1a08ae5b158d5f5d9c57fa8ea6d0f6ef3bfd63dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a08ae5b158d5f5d9c57fa8e...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jan 20 19:56:24 2006 +0100
configure: Remove the -mpreferred-stack-boundary option, this breaks MacOS.
---
configure | 65 ---------------------------------------------------------- configure.ac | 13 ------------ 2 files changed, 0 insertions(+), 78 deletions(-)
diff --git a/configure b/configure index 4de3c19..c95d335 100755 --- a/configure +++ b/configure @@ -11382,71 +11382,6 @@ _ACEOF
fi
- case $host_cpu in - *i[3456789]86*) - echo "$as_me:$LINENO: checking for gcc -mpreferred-stack-boundary=2 support" >&5 -echo $ECHO_N "checking for gcc -mpreferred-stack-boundary=2 support... $ECHO_C" >&6 -if test "${ac_cv_c_gcc_stack_boundary+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: "$ac_link"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_gcc_stack_boundary="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_gcc_stack_boundary="no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -echo "$as_me:$LINENO: result: $ac_cv_c_gcc_stack_boundary" >&5 -echo "${ECHO_T}$ac_cv_c_gcc_stack_boundary" >&6 - if test "$ac_cv_c_gcc_stack_boundary" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -mpreferred-stack-boundary=2" - fi - ;; - esac - echo "$as_me:$LINENO: checking for gcc -fno-strict-aliasing support" >&5 echo $ECHO_N "checking for gcc -fno-strict-aliasing support... $ECHO_C" >&6 if test "${ac_cv_c_gcc_no_strict_aliasing+set}" = set; then diff --git a/configure.ac b/configure.ac index b458d7d..ca5eb8a 100644 --- a/configure.ac +++ b/configure.ac @@ -810,19 +810,6 @@ int main(void) { AC_DEFINE(CC_FLAG_SHORT_WCHAR, "-fshort-wchar", [Specifies the compiler flag that forces a short wchar_t]) fi
- dnl Check for -mpreferred-stack-boundary - case $host_cpu in - *i[[3456789]]86*) - AC_CACHE_CHECK([for gcc -mpreferred-stack-boundary=2 support], ac_cv_c_gcc_stack_boundary, - [WINE_TRY_CFLAGS([-mpreferred-stack-boundary=2], - ac_cv_c_gcc_stack_boundary="yes",ac_cv_c_gcc_stack_boundary="no")]) - if test "$ac_cv_c_gcc_stack_boundary" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -mpreferred-stack-boundary=2" - fi - ;; - esac - dnl Check for -fno-strict-aliasing AC_CACHE_CHECK([for gcc -fno-strict-aliasing support], ac_cv_c_gcc_no_strict_aliasing, [WINE_TRY_CFLAGS([-fno-strict-aliasing],