r1729 - in glibc-package/branches/glibc-2.4/debian: . patches patches/hppa
Author: aurel32
Date: 2006-08-15 10:10:46 +0000 (Tue, 15 Aug 2006)
New Revision: 1729
Removed:
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
Remove hppa/submitted-fpu.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-15 09:58:39 UTC (rev 1728)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-15 10:10:46 UTC (rev 1729)
@@ -90,7 +90,7 @@
* Update hppa/local-inlining.diff to reflect the new port add-on.
* Update hppa/submitted-drop-utimes.diff.
* Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
- * Update hppa/submitted-fpu.diff to reflect the new port add-on.
+ * Remove hppa/submitted-fpu.diff (merged upstream).
* Remove hppa/submitted-iitlbp.diff (merged upstream).
* Update hppa/submitted-sysdeps.diff.
* Remove hurd-i386/cvs-ioctl-pfinet.diff (merged upstream).
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff 2006-08-15 09:58:39 UTC (rev 1728)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff 2006-08-15 10:10:46 UTC (rev 1729)
@@ -1,76 +0,0 @@
-# DP: Description: hppa floating point exception handling fix
-# DP: Related bugs: Debian #342545
-# DP: Dpatch author: Randolph Chung <tausq@debian.org>
-# DP: Patch author: Randolph Chung <tausq@debian.org>
-# DP: Upstream status: Pending
-# DP: Status Details: to be merged by Carlos
-# DP: Date: Sun, 15 Jan 2006
-
-diff -uNr ports/sysdeps/hppa/fpu.orig/fegetenv.c ports/sysdeps/hppa/fpu/fegetenv.c
---- ports/sysdeps/hppa/fpu.orig/fegetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ ports/sysdeps/hppa/fpu/fegetenv.c 2006-01-14 10:19:08.000000000 -0800
-@@ -27,10 +27,7 @@
- unsigned long long buf[4], *bufptr = buf;
-
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (buf), "+r" (bufptr));
- memcpy (envp, buf, sizeof (*envp));
- return 0;
-diff -uNr ports/sysdeps/hppa/fpu.orig/feholdexcpt.c ports/sysdeps/hppa/fpu/feholdexcpt.c
---- ports/sysdeps/hppa/fpu.orig/feholdexcpt.c 2006-01-14 10:17:19.000000000 -0800
-+++ ports/sysdeps/hppa/fpu/feholdexcpt.c 2006-01-14 10:20:21.000000000 -0800
-@@ -30,10 +30,7 @@
- /* Store the environment. */
- bufptr = clear.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (clear), "+r" (bufptr));
- memcpy (envp, &clear.env, sizeof (fenv_t));
-
-@@ -47,10 +44,7 @@
- /* Load the new environment. */
- bufptr = clear.buf;
- __asm__ (
-- "fldd,ma 8(%0),%%fr0\n"
-- "fldd,ma 8(%0),%%fr1\n"
-- "fldd,ma 8(%0),%%fr2\n"
-- "fldd 0(%0),%%fr3\n"
-+ "fldd 0(%0),%%fr0\n"
- : : "r" (bufptr), "m" (clear));
-
- return 0;
-diff -uNr ports/sysdeps/hppa/fpu.orig/fesetenv.c ports/sysdeps/hppa/fpu/fesetenv.c
---- ports/sysdeps/hppa/fpu.orig/fesetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ ports/sysdeps/hppa/fpu/fesetenv.c 2006-01-14 10:20:44.000000000 -0800
-@@ -34,10 +34,7 @@
- we want to use from the environment specified by the parameter. */
- bufptr = temp.buf;
- __asm__ (
-- "fstd,ma %%fr0,8(%1)\n"
-- "fstd,ma %%fr1,8(%1)\n"
-- "fstd,ma %%fr2,8(%1)\n"
-- "fstd %%fr3,0(%1)\n"
-+ "fstd %%fr0,0(%1)\n"
- : "=m" (temp), "+r" (bufptr));
-
- temp.env.__status_word &= ~(FE_ALL_EXCEPT
-@@ -56,9 +53,6 @@
- /* Load the new environment. */
- bufptr = temp.buf;
- __asm__ (
-- "fldd,ma -8(%1),%%fr3\n"
-- "fldd,ma -8(%1),%%fr2\n"
-- "fldd,ma -8(%1),%%fr1\n"
- "fldd 0(%1),%%fr0\n"
- : "=m" (temp), "+r" (bufptr));
-
-
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-15 09:58:39 UTC (rev 1728)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-15 10:10:46 UTC (rev 1729)
@@ -62,7 +62,6 @@
hppa/submitted-lt.diff -p1
#hppa/submitted-sysdeps.diff -p0
#hppa/submitted-fenv-align.diff -p0
-#hppa/submitted-fpu.diff -p0
hppa/cvs-pie-relocs.diff -p0
#hppa/cvs-no-ldbl-128.diff -p0
hppa/local-inlining.diff -p0
Reply to: