r2297 - in glibc-package/trunk/debian: . patches patches/arm
Author: aurel32
Date: 2007-05-26 11:05:19 +0000 (Sat, 26 May 2007)
New Revision: 2297
Added:
glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* arm/cvs-procinfo-eabi.diff: patch from CVS to not include asm/procinfo.h.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-26 04:21:28 UTC (rev 2296)
+++ glibc-package/trunk/debian/changelog 2007-05-26 11:05:19 UTC (rev 2297)
@@ -2,8 +2,9 @@
* kfreebsd/local-sysdeps.diff: update to revision 1942 (from glibc-bsd).
Thanks to Petr Salinger.
+ * arm/cvs-procinfo-eabi.diff: patch from CVS to not include asm/procinfo.h.
- -- Aurelien Jarno <aurel32@debian.org> Wed, 23 May 2007 06:17:32 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 26 May 2007 13:01:53 +0200
glibc (2.5-9) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff 2007-05-26 11:05:19 UTC (rev 2297)
@@ -0,0 +1,251 @@
+2006-10-31 Joseph S. Myers <joseph@codesourcery.com>
+
+ * sysdeps/arm/eabi/fclrexcpt.c: Include <sysdep.h> instead of
+ <asm/procinfo.h>. Use HWCAP_ARM_VFP instead of HWCAP_VFP.
+ * sysdeps/arm/eabi/fedisblxcpt.c: Likewise.
+ * sysdeps/arm/eabi/feenablxcpt.c: Likewise.
+ * sysdeps/arm/eabi/fegetenv.c: Likewise.
+ * sysdeps/arm/eabi/fegetexcept.c: Likewise.
+ * sysdeps/arm/eabi/fegetround.c: Likewise.
+ * sysdeps/arm/eabi/feholdexcpt.c: Likewise.
+ * sysdeps/arm/eabi/fesetenv.c: Likewise.
+ * sysdeps/arm/eabi/fesetround.c: Likewise.
+ * sysdeps/arm/eabi/fraiseexcpt.c: Likewise.
+ * sysdeps/arm/eabi/fsetexcptflg.c: Likewise.
+ * sysdeps/arm/eabi/ftestexcept.c: Likewise.
+ * sysdeps/arm/eabi/setfpucw.c: Likewise.
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fclrexcpt.c ports/sysdeps/arm/eabi/fclrexcpt.c
+--- ports.orig/sysdeps/arm/eabi/fclrexcpt.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fclrexcpt.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ __feclearexcept (int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long int temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fedisblxcpt.c ports/sysdeps/arm/eabi/fedisblxcpt.c
+--- ports.orig/sysdeps/arm/eabi/fedisblxcpt.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fedisblxcpt.c 2006-10-31 18:20:42.000000000 +0100
+@@ -24,12 +24,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ fedisableexcept (int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long int new_exc, old_exc;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/feenablxcpt.c ports/sysdeps/arm/eabi/feenablxcpt.c
+--- ports.orig/sysdeps/arm/eabi/feenablxcpt.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/feenablxcpt.c 2006-10-31 18:20:42.000000000 +0100
+@@ -24,12 +24,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ feenableexcept (int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long int new_exc, old_exc;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetenv.c ports/sysdeps/arm/eabi/fegetenv.c
+--- ports.orig/sysdeps/arm/eabi/fegetenv.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fegetenv.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ __fegetenv (fenv_t *envp)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long int temp;
+ _FPU_GETCW (temp);
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetexcept.c ports/sysdeps/arm/eabi/fegetexcept.c
+--- ports.orig/sysdeps/arm/eabi/fegetexcept.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fegetexcept.c 2006-10-31 18:20:42.000000000 +0100
+@@ -24,12 +24,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ fegetexcept (void)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetround.c ports/sysdeps/arm/eabi/fegetround.c
+--- ports.orig/sysdeps/arm/eabi/fegetround.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fegetround.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ fegetround (void)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned int temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/feholdexcpt.c ports/sysdeps/arm/eabi/feholdexcpt.c
+--- ports.orig/sysdeps/arm/eabi/feholdexcpt.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/feholdexcpt.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ feholdexcept (fenv_t *envp)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned long int temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fesetenv.c ports/sysdeps/arm/eabi/fesetenv.c
+--- ports.orig/sysdeps/arm/eabi/fesetenv.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fesetenv.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ __fesetenv (const fenv_t *envp)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ unsigned int temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fesetround.c ports/sysdeps/arm/eabi/fesetround.c
+--- ports.orig/sysdeps/arm/eabi/fesetround.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fesetround.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ fesetround (int round)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ fpu_control_t temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fraiseexcpt.c ports/sysdeps/arm/eabi/fraiseexcpt.c
+--- ports.orig/sysdeps/arm/eabi/fraiseexcpt.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fraiseexcpt.c 2006-10-31 18:20:42.000000000 +0100
+@@ -24,12 +24,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ feraiseexcept (int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ int fpscr;
+ const float fp_zero = 0.0, fp_one = 1.0, fp_max = FLT_MAX,
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fsetexcptflg.c ports/sysdeps/arm/eabi/fsetexcptflg.c
+--- ports.orig/sysdeps/arm/eabi/fsetexcptflg.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/fsetexcptflg.c 2006-10-31 18:20:42.000000000 +0100
+@@ -24,12 +24,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ __fesetexceptflag (const fexcept_t *flagp, int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ fexcept_t temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/ftestexcept.c ports/sysdeps/arm/eabi/ftestexcept.c
+--- ports.orig/sysdeps/arm/eabi/ftestexcept.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/ftestexcept.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ int
+ fetestexcept (int excepts)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ fexcept_t temp;
+
+diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/setfpucw.c ports/sysdeps/arm/eabi/setfpucw.c
+--- ports.orig/sysdeps/arm/eabi/setfpucw.c 2005-10-10 17:29:32.000000000 +0200
++++ ports/sysdeps/arm/eabi/setfpucw.c 2006-10-31 18:20:42.000000000 +0100
+@@ -23,12 +23,12 @@
+ #include <unistd.h>
+ #include <ldsodefs.h>
+ #include <dl-procinfo.h>
+-#include <asm/procinfo.h>
++#include <sysdep.h>
+
+ void
+ __setfpucw (fpu_control_t set)
+ {
+- if (GLRO (dl_hwcap) & HWCAP_VFP)
++ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+ {
+ fpu_control_t cw;
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-05-26 04:21:28 UTC (rev 2296)
+++ glibc-package/trunk/debian/patches/series 2007-05-26 11:05:19 UTC (rev 2297)
@@ -47,6 +47,7 @@
arm/cvs-check_pf.c -p0
arm/cvs-gcc4-inline.diff -p0
+arm/cvs-procinfo-eabi.diff -p0
arm/local-ioperm.diff -p0
arm/local-no-hwcap.diff -p0
Reply to: