diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-06-15 18:29:53 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-06-15 18:29:53 +0400 |
| commit | d2e58e4e49f4c42c3c6b1220ccc0004ed6963192 (patch) | |
| tree | 5880c5bba33a6528e64c05d9c806179afebd4ca3 /sql | |
| parent | 6537d79e451ae0242e8f7b138cda95993d8e8cc3 (diff) | |
| download | mariadb-git-d2e58e4e49f4c42c3c6b1220ccc0004ed6963192.tar.gz | |
Backport of the patch for bug52208 to 5.1 since the
root cause of 52208 resulted in another test failure
in 5.1.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7356d4e917e..daa1bbe8ccc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -190,9 +190,9 @@ typedef fp_except fp_except_t; # define fpu_control_t unsigned int # define _FPU_EXTENDED 0x300 # define _FPU_DOUBLE 0x200 -# ifdef __GNUC__ -# define _FPU_GETCW(cw) __asm__ __volatile__("fnstcw %0" : "=m" (*&cw)) -# define _FPU_SETCW(cw) __asm__ __volatile__("fldcw %0" : : "m" (*&cw)) +# if defined(__GNUC__) || defined(__SUNPRO_CC) +# define _FPU_GETCW(cw) asm volatile ("fnstcw %0" : "=m" (*&cw)) +# define _FPU_SETCW(cw) asm volatile ("fldcw %0" : : "m" (*&cw)) # else # define _FPU_GETCW(cw) (cw= 0) # define _FPU_SETCW(cw) |