diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | defines.h | 13 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
3 files changed, 19 insertions, 7 deletions
@@ -1,3 +1,11 @@ +Fri Sep 26 09:52:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <nahi@ruby-lang.org> * lib/README: updated. @@ -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 8a3c7c9147..cadf81ee27 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 |