diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
| commit | 40d5df28bc4278d543697c960267ba3b5da74163 (patch) | |
| tree | 4a1cae5501cb263d8b2fbd821ff0434bc7732809 /libm/include | |
| parent | 6ed844f1f2e3a53939b606011a76fb3e353a7a92 (diff) | |
| parent | 50a83255d80f98b857c3f72dd2225d4bbc720ca3 (diff) | |
| download | android_bionic-gingerbread-release.tar.gz android_bionic-gingerbread-release.tar.bz2 android_bionic-gingerbread-release.zip | |
Merge branch 'gingerbread' of git://git.omapzoom.org/platform/bionic into 237cm-7.1.0gingerbread-release
Conflicts:
libc/Android.mk
libthread_db/Android.mk
Change-Id: I4a730f70bf3b31331ab9cee5f1a098d4162ef4b7
Diffstat (limited to 'libm/include')
| -rw-r--r-- | libm/include/i387/fenv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libm/include/i387/fenv.h b/libm/include/i387/fenv.h index b124366ac..4281f10eb 100644 --- a/libm/include/i387/fenv.h +++ b/libm/include/i387/fenv.h @@ -102,7 +102,7 @@ extern const fenv_t __fe_dfl_env; #define __fnclex() __asm __volatile("fnclex") #define __fnstenv(__env) __asm __volatile("fnstenv %0" : "=m" (*(__env))) #define __fnstcw(__cw) __asm __volatile("fnstcw %0" : "=m" (*(__cw))) -#define __fnstsw(__sw) __asm __volatile("fnstsw %0" : "=am" (*(__sw))) +#define __fnstsw(__sw) __asm __volatile("fnstsw %0" : "=a" (*(__sw))) #define __fwait() __asm __volatile("fwait") #define __ldmxcsr(__csr) __asm __volatile("ldmxcsr %0" : : "m" (__csr)) #define __stmxcsr(__csr) __asm __volatile("stmxcsr %0" : "=m" (*(__csr))) @@ -148,7 +148,8 @@ int feraiseexcept(int __excepts); static __inline int fetestexcept(int __excepts) { - int __mxcsr, __status; + int __mxcsr; + short __status; __fnstsw(&__status); if (__HAS_SSE()) |