summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-20 13:56:17 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-20 13:56:17 +0000
commit78a2c1a93bd6f895f526062d496d4718bac95d06 (patch)
tree6143c51b8a42ac7ceba96a3d5456453efd9382b8 /configure.in
parentd4e0396719a59efe924a6373de5914a54d9cb5b2 (diff)
merge revision(s) 39162,39163: [Backport #8080]
* configure.in: change CFLAGS temporally to test ARCH_FLAG="-march=i486". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 7e8a506fa6..86f6ac8271 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,14 +1568,17 @@ AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
[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"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -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])])
+ [rb_cv_gcc_compiler_cas=yes
+ ARCH_FLAG="-march=i486"],
+ [rb_cv_gcc_compiler_cas=no])])
+ CFLAGS="$save_CFLAGS"
fi])
AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,