diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-23 17:34:58 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-23 17:34:58 +0000 |
| commit | 60aa9c809b58b214cba304b28f5813c8a7399a92 (patch) | |
| tree | 36cb850b95f9d84d00bd98666e00b8232c2c0146 | |
| parent | c34db589139980914f0b05d27b2499ac5bec615a (diff) | |
| download | bundler-60aa9c809b58b214cba304b28f5813c8a7399a92.tar.gz | |
* include/ruby/intern.h: pcc can't use __builtin_constant_p.
* vm_exec.c: change condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/intern.h | 2 | ||||
| -rw-r--r-- | vm_exec.c | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Apr 24 02:25:23 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * include/ruby/intern.h: pcc can't use __builtin_constant_p. + + * vm_exec.c: change condition. + Sun Apr 24 01:58:01 2011 NARUSE, Yui <naruse@ruby-lang.org> * ext/date/date_core.c (leap_p): surpress warning: parentheses. diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 37210e1a5a..7e552d41cf 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -715,7 +715,7 @@ VALUE rb_str_length(VALUE); long rb_str_offset(VALUE, long); size_t rb_str_capacity(VALUE); VALUE rb_str_ellipsize(VALUE, long); -#if defined __GNUC__ +#if defined(__GNUC__) && !defined(__PCC__) #define rb_str_new_cstr(str) __extension__ ( \ { \ (__builtin_constant_p(str)) ? \ @@ -11,13 +11,13 @@ #include <math.h> -#if VMDEBUG > 0 +#if (VMDEBUG > 0) || defined(__clang) #define DECL_SC_REG(type, r, reg) register type reg_##r -#elif __GNUC__ && __x86_64__ && !__clang__ +#elif __GNUC__ && __x86_64__ #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg) -#elif __GNUC__ && __i386__ && !__clang__ +#elif __GNUC__ && __i386__ #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("e" reg) #else |