ruby-changes:22150
From: kosaki <ko1@a...>
Date: Tue, 3 Jan 2012 19:12:21 +0900 (JST)
Subject: [ruby-changes:22150] kosaki:r34199 (ruby_1_9_3): merge revision(s) %s: 33757:33758
kosaki 2012-01-03 19:12:07 +0900 (Tue, 03 Jan 2012) New Revision: 34199 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34199 Log: merge revision(s) %s: 33757:33758 * include/ruby/defines.h (FLUSH_REGISTER_WINDOWS): move sparc asm code to a separete file sparc.c for preventing inlining optimization. Patched by Jurij Smakov. [Bug #5244] [ruby-core:40685] * sparc.c (rb_sparc_flush_register_windows): ditto. * configure.in: ditto. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/configure.in branches/ruby_1_9_3/include/ruby/defines.h Index: ruby_1_9_3/include/ruby/defines.h =================================================================== --- ruby_1_9_3/include/ruby/defines.h (revision 34198) +++ ruby_1_9_3/include/ruby/defines.h (revision 34199) @@ -268,21 +268,8 @@ #endif #if defined(sparc) || defined(__sparc__) -static inline void -flush_register_windows(void) -{ - asm -#ifdef __GNUC__ - volatile -#endif -# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__) - ("flushw") -# else - ("ta 0x03") -# endif /* trap always to flush register windows if we are on a Sparc system */ - ; -} -# define FLUSH_REGISTER_WINDOWS flush_register_windows() +void rb_sparc_flush_register_windows(void); +# define FLUSH_REGISTER_WINDOWS rb_sparc_flush_register_windows() #elif defined(__ia64) void *rb_ia64_bsp(void); void rb_ia64_flushrs(void); Index: ruby_1_9_3/configure.in =================================================================== --- ruby_1_9_3/configure.in (revision 34198) +++ ruby_1_9_3/configure.in (revision 34199) @@ -1137,7 +1137,8 @@ [CFLAGS="-mieee $CFLAGS"], [osf*], # ccc [CFLAGS="-ieee $CFLAGS"], - )]) + )], +[sparc*], [AC_LIBOBJ([sparc])]) ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no} if test "$ac_cv_header_net_socket_h" = yes; then Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 34198) +++ ruby_1_9_3/ChangeLog (revision 34199) @@ -1,3 +1,11 @@ +Tue Jan 3 19:05:42 2012 Naohisa Goto <ngotogenome@g...> + + * include/ruby/defines.h (FLUSH_REGISTER_WINDOWS): move sparc asm code + to a separete file sparc.c for preventing inlining optimization. + Patched by Jurij Smakov. [Bug #5244] [ruby-core:40685] + * sparc.c (rb_sparc_flush_register_windows): ditto. + * configure.in: ditto. + Mon Jan 2 23:52:20 2012 TAKAO Kouji <kouji@t...> * ext/readline/readline.c (Init_readline): libedit check -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/