r3415 - in glibc-package/trunk/debian: . patches patches/arm
Author: aurel32
Date: 2009-04-24 09:48:53 +0000 (Fri, 24 Apr 2009)
New Revision: 3415
Added:
glibc-package/trunk/debian/patches/arm/submitted-fpu_control_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* arm/submitted-fpu_control_h.diff: new patch to disable macros from
<fpu_control.h> on EABI.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-04-23 21:10:41 UTC (rev 3414)
+++ glibc-package/trunk/debian/changelog 2009-04-24 09:48:53 UTC (rev 3415)
@@ -6,6 +6,8 @@
setcontext, makecontext, swapcontext.
* any/submitted-mount_h.diff: new patch to add MNT_DETACH and MNT_EXPIRE to
sys/mount.h. Closes: #523952.
+ * arm/submitted-fpu_control_h.diff: new patch to disable macros from
+ <fpu_control.h> on EABI.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2450 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/arm/submitted-fpu_control_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/submitted-fpu_control_h.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/submitted-fpu_control_h.diff 2009-04-24 09:48:53 UTC (rev 3415)
@@ -0,0 +1,34 @@
+2009-04-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/armel/fpu_control.h: If soft-float, don't use
+ floating-point registers.
+
+diff --git a/ports/sysdeps/arm/eabi/fpu_control.h b/sysdeps/arm/eabi/fpu_control.h
+index 55d7764..30f0f68 100644
+--- a/ports/sysdeps/arm/eabi/fpu_control.h
++++ b/ports/sysdeps/arm/eabi/fpu_control.h
+@@ -20,6 +20,17 @@
+ #ifndef _FPU_CONTROL_H
+ #define _FPU_CONTROL_H
+
++#ifdef __SOFTFP__
++
++#define _FPU_RESERVED 0xffffffff
++#define _FPU_DEFAULT 0x00000000
++typedef unsigned int fpu_control_t;
++#define _FPU_GETCW(cw) 0
++#define _FPU_SETCW(cw) do { } while (0)
++extern fpu_control_t __fpu_control;
++
++#else
++
+ /* masking of interrupts */
+ #define _FPU_MASK_IM 0x00000100 /* invalid operation */
+ #define _FPU_MASK_ZM 0x00000200 /* divide by zero */
+@@ -48,4 +59,6 @@ typedef unsigned int fpu_control_t;
+ /* Default control word set at startup. */
+ extern fpu_control_t __fpu_control;
+
++#endif /* __SOFTFP__ */
++
+ #endif /* _FPU_CONTROL_H */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-04-23 21:10:41 UTC (rev 3414)
+++ glibc-package/trunk/debian/patches/series 2009-04-24 09:48:53 UTC (rev 3415)
@@ -61,6 +61,7 @@
arm/local-lowlevellock.diff
arm/local-no-hwcap.diff
arm/submitted-setjmp.diff
+arm/submitted-fpu_control_h.diff
hppa/local-inlining.diff
hppa/local-linuxthreads.diff
Reply to: