diff options
| author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-24 09:37:04 +0000 |
|---|---|---|
| committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-24 09:37:04 +0000 |
| commit | 322ec847726b4f596e3892e4a7192bd7a3a59dd2 (patch) | |
| tree | b147dc8d323c809b190b7d2bce5668fe0274d871 | |
| parent | 3184407aef70a7e5ee1d732e3e3c467ec99951d7 (diff) | |
| download | ruby-322ec847726b4f596e3892e4a7192bd7a3a59dd2.tar.gz | |
* vm_insnhelper.c (INLINE): disbale r54738 if __NO_INLINE__ is defined.
It caused "undefined reference to `vm_getivar'".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Apr 24 18:33:58 2016 Kazuki Tsujimoto <kazuki@callcc.net> + + * vm_insnhelper.c (INLINE): disbale r54738 if __NO_INLINE__ is defined. + It caused "undefined reference to `vm_getivar'". + Sun Apr 24 09:32:12 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> * test/ruby/test_array.rb: Add test cases for Array#sum with diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 6d9973eb04..eef87df9e6 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -19,7 +19,7 @@ /* control stack frame */ #undef INLINE -#if defined __GNUC__ && !defined __clang__ +#if defined __GNUC__ && !defined(__NO_INLINE__) && !defined __clang__ #define INLINE inline #else #define INLINE static inline |