aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 887be3f75d..d379ca74f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 8 21:19:41 2013 Tanaka Akira <akr@fsij.org>
+
+ * configure.in: don't define ARCH_FLAG="-march=i486" if it causes
+ compilation problem.
+
Fri Feb 8 19:56:54 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* array.c (rb_ary_dup): reverted r39004. see [Bug #7768], and
diff --git a/configure.in b/configure.in
index 5850bbf488..ea57241230 100644
--- a/configure.in
+++ b/configure.in
@@ -1553,7 +1553,15 @@ AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
[rb_cv_gcc_compiler_cas=yes],
[rb_cv_gcc_compiler_cas=no])])
if test "$rb_cv_gcc_compiler_cas" = no; then
+ unset rb_cv_gcc_compiler_cas
ARCH_FLAG="-march=i486"
+ AC_CACHE_CHECK([for __sync_val_compare_and_swap with -march=i486], [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; unset ARCH_FLAG])])
fi])
AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,