summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-27 18:59:34 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-27 18:59:34 (GMT)
commitf48ae0d10c5b586db5748b0d4b645c7e9ff5d52e (patch)
tree03c429887961bbd09af63e1a02c1930b9fed72a9
parentb912e1d2c02a038818aac2a82a1dc927a70e0750 (diff)
merge revision(s) 44717:ruby_1_8_7
* configure.in: define USE_BUILTIN_FRAME_ADDRESS on x86_64 even if __builtin_frame_address is not used now. By this, FreeBSD's clang can build ruby 1.8, and alloca(1) doesn't work on it. git-svn-id: svn+ssh://svn.ruby-lang.org/ruby/branches/ruby_1_8_7@44719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--configure.in1
-rw-r--r--version.h12
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bc6d98..0808298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 28 03:59:15 2014 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: define USE_BUILTIN_FRAME_ADDRESS on x86_64
+ even if __builtin_frame_address is not used now.
+ By this, FreeBSD's clang can build ruby 1.8,
+ and alloca(1) doesn't work on it.
+
Fri Nov 22 12:43:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strtod): ignore too long fraction part, which does not
diff --git a/configure.in b/configure.in
index 62b34a8..306d536 100644
--- a/configure.in
+++ b/configure.in
@@ -144,6 +144,7 @@ fi
case $target_cpu in
i?86) frame_address=yes;;
+ x86_64) frame_address=yes;;
*) frame_address=no;;
esac
AC_ARG_ENABLE(frame-address,
diff --git a/version.h b/version.h
index af541ec..d8e8abf 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2013-12-23"
+#define RUBY_RELEASE_DATE "2014-01-28"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20131223
-#define RUBY_PATCHLEVEL 375
+#define RUBY_RELEASE_CODE 20140128
+#define RUBY_PATCHLEVEL 376
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
-#define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_YEAR 2014
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 28
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];