nobu	2009-11-01 16:24:18 +0900 (Sun, 01 Nov 2009)

  New Revision: 25613

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25613

  Log:
    * configure.in (rb_cv_stack_grow_dir): fix for universal binary.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 25612)
+++ configure.in	(revision 25613)
@@ -1483,12 +1483,13 @@
   RUBY_CHECK_SYSCONF(CLK_TCK)
 fi
 
-case "$target_cpu" in
-when(m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-when(hppa*) rb_cv_stack_grow_dir=+1;;
-esac
-AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
-  [AC_TRY_RUN([
+AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
+    AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [
+case "$1" in
+when(m68*|x86*|i?86|ia64|ppc*|sparc*|alpha*) $2=-1;;
+when(hppa*) $2=+1;;
+when(*)
+  AC_TRY_RUN([
 /* recurse to get rid of inlining */
 static int
 stack_growup_p(addr, n)
@@ -1505,8 +1506,39 @@
     int x;
     return stack_growup_p(&x, 10);
 }
-], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
-AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
+], $2=-1, $2=+1, $2=0)
+esac
+eval rb_cv_stack_grow_dir_$1=\$$2])])
+if test "${universal_binary-no}" = yes ; then
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
+    stack_dir=
+    for archs in ${universal_archnames}; do
+	archs=`echo $archs | sed 's/=.*//'`
+	CFLAGS="$new_cflags -arch $archs"
+	LDFLAGS="$new_ldflags -arch $archs"
+	RUBY_STACK_GROW_DIRECTION($archs, dir)
+	if test x$stack_dir = x; then
+	    stack_dir=$dir
+	elif test x$stack_dir != x$dir; then
+	    stack_dir=no
+	fi
+    done
+    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
+    if test x$stack_dir = xno; then
+	for archs in ${universal_archnames}; do
+	    archs=`echo $archs | sed 's/=.*//'`
+	    eval dir=\$rb_cv_stack_grow_dir_$archs
+	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
+	done
+    else
+	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
+    fi
+else
+    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
+    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
+fi
 
 if test x"$enable_pthread" = xyes; then
     for pthread_lib in thr pthread pthreads c c_r root; do
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25612)
+++ ChangeLog	(revision 25613)
@@ -1,5 +1,7 @@
-Sun Nov  1 16:23:03 2009  Nobuyoshi Nakada  <nobu@r...>
+Sun Nov  1 16:24:16 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in (rb_cv_stack_grow_dir): fix for universal binary.
+
 	* configure.in (sitehdrdir, vendorhdrdir): fixed default values.
 
 Sun Nov  1 13:31:16 2009  wanabe  <s.wanabe@g...>

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/