r3471 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/arm
Author: aurel32
Date: 2009-05-09 22:59:31 +0000 (Sat, 09 May 2009)
New Revision: 3471
Removed:
glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-fpu_control_h.diff
glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-setjmp.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
- Remove debian/patches/arm/submitted-setjmp.diff (merged).
- Remove debian/patches/arm/submitted-fpu_control_h.diff (merged).
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-09 22:54:52 UTC (rev 3470)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-09 22:59:31 UTC (rev 3471)
@@ -8,7 +8,10 @@
debian/locales-depver: upgrade to 2.10.
- alpha has been moved to ports, update debian/patches/alpha/*
accordingly.
+ - Remove debian/patches/arm/submitted-setjmp.diff (merged).
+ - Remove debian/patches/arm/submitted-fpu_control_h.diff (merged).
+
-- Aurelien Jarno <aurel32@debian.org> Tue, 05 May 2009 09:57:43 +0200
eglibc (2.9-13) unstable; urgency=low
Deleted: glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-fpu_control_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-fpu_control_h.diff 2009-05-09 22:54:52 UTC (rev 3470)
+++ glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-fpu_control_h.diff 2009-05-09 22:59:31 UTC (rev 3471)
@@ -1,34 +0,0 @@
-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
-
-+#if !defined(_LIBC) && defined(__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 */
Deleted: glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-setjmp.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-setjmp.diff 2009-05-09 22:54:52 UTC (rev 3470)
+++ glibc-package/branches/eglibc-2.10/debian/patches/arm/submitted-setjmp.diff 2009-05-09 22:59:31 UTC (rev 3471)
@@ -1,12 +0,0 @@
----
- ports/sysdeps/arm/fpu/setjmp.S | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/ports/sysdeps/arm/fpu/setjmp.S
-+++ b/ports/sysdeps/arm/fpu/setjmp.S
-@@ -33,3 +33,5 @@
- /* Make a tail call to __sigjmp_save; it takes the same args. */
- B PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
- END (__sigsetjmp)
-+
-+hidden_def (__sigsetjmp)
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-09 22:54:52 UTC (rev 3470)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-09 22:59:31 UTC (rev 3471)
@@ -61,8 +61,6 @@
arm/local-ioperm.diff
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: