ruby-changes:21475
From: akr <ko1@a...>
Date: Tue, 25 Oct 2011 21:54:32 +0900 (JST)
Subject: [ruby-changes:21475] akr:r33524 (trunk): * include/ruby/defines.h: use "__sparc" instead of "sparc" and
akr 2011-10-25 21:54:21 +0900 (Tue, 25 Oct 2011) New Revision: 33524 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33524 Log: * include/ruby/defines.h: use "__sparc" instead of "sparc" and "__sparc__". * dln.c: ditto. [ruby-dev:44694] Modified files: trunk/ChangeLog trunk/dln.c trunk/include/ruby/defines.h Index: include/ruby/defines.h =================================================================== --- include/ruby/defines.h (revision 33523) +++ include/ruby/defines.h (revision 33524) @@ -197,7 +197,7 @@ /* MB_CUR_MAX will not work well in C locale */ #endif -#if defined(sparc) || defined(__sparc__) +#if defined(__sparc) static inline void flush_register_windows(void) { Index: ChangeLog =================================================================== --- ChangeLog (revision 33523) +++ ChangeLog (revision 33524) @@ -1,3 +1,12 @@ +Tue Oct 25 21:52:31 2011 Tanaka Akira <akr@f...> + + * include/ruby/defines.h: use "__sparc" instead of "sparc" and + "__sparc__". + + * dln.c: ditto. + + [ruby-dev:44694] + Tue Oct 25 06:34:39 2011 Eric Hodel <drbrain@s...> * re.c (match_aref): Use <code> around indexing examples to prevent Index: dln.c =================================================================== --- dln.c (revision 33523) +++ dln.c (revision 33524) @@ -228,7 +228,7 @@ #define RELOC_TARGET_SIZE(r) ((r)->r_length) #endif -#if defined(__sun) && defined(sparc) +#if defined(__sun) && defined(__sparc) /* Sparc (Sun 4) macros */ # undef relocation_info # define relocation_info reloc_info_sparc @@ -530,7 +530,7 @@ { int datum; char *address; -#if defined(__sun) && defined(sparc) +#if defined(__sun) && defined(__sparc) unsigned int mask = 0; #endif @@ -539,7 +539,7 @@ datum = arg->value; if (R_PCREL(&(undef->reloc))) datum -= undef->base; -#if defined(__sun) && defined(sparc) +#if defined(__sun) && defined(__sparc) datum += undef->reloc.r_addend; datum >>= R_RIGHTSHIFT(&(undef->reloc)); mask = (1 << R_BITSIZE(&(undef->reloc))) - 1; @@ -763,7 +763,7 @@ while (rel < rel_end) { char *address = (char*)(rel->r_address + block); long datum = 0; -#if defined(__sun) && defined(sparc) +#if defined(__sun) && defined(__sparc) unsigned int mask = 0; #endif @@ -798,7 +798,7 @@ } /* end .. is static */ if (R_PCREL(rel)) datum -= block; -#if defined(__sun) && defined(sparc) +#if defined(__sun) && defined(__sparc) datum += rel->r_addend; datum >>= R_RIGHTSHIFT(rel); mask = (1 << R_BITSIZE(rel)) - 1; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/