arrfab / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh1302086-1.patch

147e83
commit 196f456b842ee96e1bf1e5ae6ed21ba427dee3f3
147e83
Author: Marcus Shawcroft <marcus.shawcroft@linaro.org>
147e83
Date:   Tue Jan 7 16:16:35 2014 +0000
147e83
147e83
    [AArch64] Fix FP_ROUNDMODE.
147e83
    
147e83
    [BZ #16387] Fix FP_ROUNDMODE to extract the correct bits from FPCR.
147e83
147e83
diff --git a/ports/sysdeps/aarch64/fpu/fpu_control.h b/ports/sysdeps/aarch64/fpu/fpu_control.h
147e83
index 79ab5fb..6a265e8 100644
147e83
--- a/ports/sysdeps/aarch64/fpu/fpu_control.h
147e83
+++ b/ports/sysdeps/aarch64/fpu/fpu_control.h
147e83
@@ -59,6 +59,9 @@
147e83
                    E E D D
147e83
                        E E
147e83
  */
147e83
+
147e83
+#define _FPU_FPCR_RM_MASK  0xc00000
147e83
+
147e83
 #define _FPU_FPCR_MASK_IXE 0x1000
147e83
 #define _FPU_FPCR_MASK_UFE 0x0800
147e83
 #define _FPU_FPCR_MASK_OFE 0x0400
147e83
diff --git a/ports/sysdeps/aarch64/soft-fp/sfp-machine.h b/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
147e83
index d21d00a..9bb94e5 100644
147e83
--- a/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
147e83
+++ b/ports/sysdeps/aarch64/soft-fp/sfp-machine.h
147e83
@@ -47,7 +47,7 @@
147e83
 
147e83
 #define _FP_DECL_EX		fpu_control_t _fcw
147e83
 
147e83
-#define FP_ROUNDMODE		(_fcw & 0x3)
147e83
+#define FP_ROUNDMODE		(_fcw & _FPU_FPCR_RM_MASK)
147e83
 
147e83
 #define FP_RND_NEAREST		FE_TONEAREST
147e83
 #define FP_RND_ZERO		FE_TOWARDZERO