From 5e73dc9233f8a5ea926c90e2178555a932b111c2 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 26 Sep 2003 00:52:49 +0000 Subject: * defines.h (flush_register_windows): use volatile only for gcc on Solaris. [ruby-dev:21403] * lib/mkmf.rb (xsystem): use system directly to honor shell meta charaters. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ defines.h | 13 +++++++++---- lib/mkmf.rb | 5 ++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e80c81e3..e23b1ca17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 26 09:52:44 2003 Nobuyoshi Nakada + + * defines.h (flush_register_windows): use volatile only for gcc on + Solaris. [ruby-dev:21403] + + * lib/mkmf.rb (xsystem): use system directly to honor shell meta + charaters. + Mon Sep 26 00:10:13 2003 NAKAMURA, Hiroshi * lib/README: updated. diff --git a/defines.h b/defines.h index 6fd17808a..2744b1650 100644 --- a/defines.h +++ b/defines.h @@ -139,13 +139,18 @@ void xfree _((void*)); static inline void flush_register_windows(void) { -# if defined(__sparc_v9__) || defined(__arch64__) - asm volatile ("flushw" : :); + asm +#ifdef __GNUC__ + volatile +#endif +# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__) + ("flushw" : :) # elif defined(linux) || defined(__linux__) - asm volatile ("ta 0x83"); + ("ta 0x83") # else /* Solaris, OpenBSD, NetBSD, etc. */ - asm volatile ("ta 0x03"); + ("ta 0x03") # endif /* trap always to flush register windows if we are on a Sparc system */ + ; } # define FLUSH_REGISTER_WINDOWS flush_register_windows() #else diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8a3c7c914..cadf81ee2 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -165,9 +165,8 @@ end def xsystem command Config.expand(command) Logging::open do - command = Shellwords.shellwords(command) - puts command.quote.join(' ') - system(*command) + puts command.quote + system(command) end end -- cgit