naruse	2012-11-28 08:30:33 +0900 (Wed, 28 Nov 2012)

  New Revision: 37911

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

  Log:
    Refix of r37904

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37910)
+++ configure.in	(revision 37911)
@@ -241,10 +241,9 @@
 
 AC_DEFUN([RUBY_DEFAULT_ARCH], [
 AC_MSG_CHECKING([arch option])
-AS_CASE([$1-$target_os],
-	[*64-*],        [ARCH_FLAG=-m64],
-	[[i[3-6]86-linux]], [ARCH_FLAG=-march=$1],
-	[[i[3-6]86-*]], [ARCH_FLAG=-m32],
+AS_CASE([$1],
+	[*64],        [ARCH_FLAG=-m64],
+	[[i[3-6]86]], [ARCH_FLAG=-m32],
 	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
 	)
 AC_MSG_RESULT([$ARCH_FLAG])
@@ -1534,7 +1533,18 @@
 [hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
 [])
 
+    AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
+       AC_TRY_LINK([unsigned long atomic_var;],
+                   [
+                       __sync_val_compare_and_swap(&atomic_var, 0, 1);
+                   ],
+                   [rb_cv_gcc_compiler_cas=yes],
+                   [rb_cv_gcc_compiler_cas=no])])
+    if test "$rb_cv_gcc_compiler_cas" = no; then
+       ARCH_FLAG="-march=i486"
+    fi
 
+
 AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
   [AC_TRY_LINK([
 #include <math.h>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37910)
+++ ChangeLog	(revision 37911)
@@ -43,6 +43,7 @@
 
 	* configure.in (ARCH_FLAG): __sync_val_compare_and_swap_4 needs
 	  -march=$target_cpu on at least linux gcc 4.1.
+	  patched by KOSAKI Motohiro
 
 Tue Nov 27 22:03:09 2012  Akinori MUSHA  <knu@i...>
 

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