aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-28 06:45:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-28 06:45:25 +0000
commit013521e55742a07fbc5a4b264862b2da21168b89 (patch)
tree3636737fc9695ebc1d294040a45d4816b9bac7cf
parente6ef313a498e5bff7a54944722abff33ef966166 (diff)
downloadruby-013521e55742a07fbc5a4b264862b2da21168b89.tar.gz
* configure.in: fix r37294: run only on i[3-6]86-linux.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in12
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d65842e99c..7aaedb65a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 28 15:37:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: fix r37294: run only on i[3-6]86-linux.
+
Wed Nov 28 15:31:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (FMODE_SYNCWRITE): removed unused macro.
diff --git a/configure.in b/configure.in
index 295894feee..c916cd5834 100644
--- a/configure.in
+++ b/configure.in
@@ -1534,6 +1534,18 @@ AS_CASE(["$target_os"],
[])
+AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86-linux*]], [
+ 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>