summaryrefslogtreecommitdiffstats
path: root/libm/include
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-12-07 06:38:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-07 06:38:26 -0800
commit48bebaeca84cd9014171d2874785ddb57d1103ae (patch)
tree21ca664efc3077e64d070721e28490e4f0ca7173 /libm/include
parente05762a5312261b96d20597eb6c3a61abaeac2cf (diff)
parent4efbf95d8c88a3a203d687d9048b51e256ef3641 (diff)
downloadbionic-48bebaeca84cd9014171d2874785ddb57d1103ae.zip
bionic-48bebaeca84cd9014171d2874785ddb57d1103ae.tar.gz
bionic-48bebaeca84cd9014171d2874785ddb57d1103ae.tar.bz2
am 4efbf95d: Merge "Use proper variable typing"
* commit '4efbf95d8c88a3a203d687d9048b51e256ef3641': Use proper variable typing
Diffstat (limited to 'libm/include')
-rw-r--r--libm/include/i387/fenv.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libm/include/i387/fenv.h b/libm/include/i387/fenv.h
index b124366..4281f10 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())