r1601 - in glibc-package/branches/glibc-2.4/debian: . patches patches/arm patches/m68k
Author: aurel32
Date: 2006-06-01 10:17:01 +0000 (Thu, 01 Jun 2006)
New Revision: 1601
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/arm/local-ioperm.diff
glibc-package/branches/glibc-2.4/debian/patches/arm/local-no-hwcap.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-compat.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Update arm/local-ioperm.diff to reflect the new port add-on.
* Update arm/local-no-hwcap.diff to reflect the new port add-on.
* Update m68k/local-compat.diff.
* Update m68k/local-mathinline_h.diff to reflect the new port add-on, but
keep it disabled.
* Update m68k/local-fpic.diff.
* Update m68k/local-reloc.diff to reflect the new port add-on.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-01 10:17:01 UTC (rev 1601)
@@ -58,6 +58,8 @@
* Update all/submitted-new-brf-encoding.diff.
* Remove alpha/cvs-gcc4-profile.diff (not needed anymore).
* Update alpha/submitted-xstat.diff.
+ * Update arm/local-ioperm.diff to reflect the new port add-on.
+ * Update arm/local-no-hwcap.diff to reflect the new port add-on.
* Remove any/cvs-argp_h.diff (merged upstream).
* Remove any/cvs-ctan.diff (merged upstream).
* Remove any/cvs-futimes.diff (merged upstream).
@@ -92,6 +94,11 @@
* Add kfreebsd/local-ftw.diff.
* Add kfreebsd/local-sysdeps-2.4.diff.
* Remove m32r/cvs-elf-m32r_rel32.diff (merged upstream).
+ * Update m68k/local-compat.diff.
+ * Update m68k/local-mathinline_h.diff to reflect the new port add-on, but
+ keep it disabled.
+ * Update m68k/local-fpic.diff.
+ * Update m68k/local-reloc.diff to reflect the new port add-on.
* Remove mips/cvs-gcc4-inline.diff (merged upstream).
* Remove mips/cvs-gcc4-sysdeps.diff (merged upstream).
* Update mips/local-librt.diff to reflect the new port add-on.
Modified: glibc-package/branches/glibc-2.4/debian/patches/arm/local-ioperm.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/arm/local-ioperm.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/arm/local-ioperm.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -1,7 +1,7 @@
# DP: Description: fix ioperm build error on arm
---- sysdeps/unix/sysv/linux/arm/ioperm.c 20 Feb 2003 22:22:35 -0000 1.6
-+++ sysdeps/unix/sysv/linux/arm/ioperm.c 24 Oct 2003 20:59:38 -0000
+--- ports/sysdeps/unix/sysv/linux/arm/ioperm.c 20 Feb 2003 22:22:35 -0000 1.6
++++ ports/sysdeps/unix/sysv/linux/arm/ioperm.c 24 Oct 2003 20:59:38 -0000
@@ -100,8 +105,8 @@
{
char systype[256];
Modified: glibc-package/branches/glibc-2.4/debian/patches/arm/local-no-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/arm/local-no-hwcap.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/arm/local-no-hwcap.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -1,7 +1,7 @@
# DP: Restricted hardware caps for ARM
---- sysdeps/unix/sysv/linux/arm/dl-procinfo.h Mon Jul 23 12:57:23 2001
-+++ sysdeps/unix/sysv/linux/arm/dl-procinfo.h Sun Feb 10 06:37:00 2002
+--- ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h Mon Jul 23 12:57:23 2001
++++ ports/sysdeps/unix/sysv/linux/arm/dl-procinfo.h Sun Feb 10 06:37:00 2002
@@ -67,7 +67,7 @@
HWCAP_ARM_VFP = 1 << 6,
HWCAP_ARM_EDSP = 1 << 7,
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-compat.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-compat.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-compat.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -1,20 +1,18 @@
# DP: Fixes some old compatibility issues with m68k and lchown/chown
-diff -urN glibc-2.2.5.orig/sysdeps/unix/sysv/linux/m68k/chown.c glibc-2.2.5/sysdeps/unix/sysv/linux/m68k/chown.c
---- glibc-2.2.5.orig/sysdeps/unix/sysv/linux/m68k/chown.c 2001-07-10 02:57:24.000000000 +0200
-+++ glibc-2.2.5/sysdeps/unix/sysv/linux/m68k/chown.c 2002-08-11 15:37:09.000000000 +0200
-@@ -72,3 +72,8 @@
- #endif
+--- ports/sysdeps/unix/sysv/linux/m68k/chown.c 2006-01-08 09:21:17.000000000 +0100
++++ ports/sysdeps/unix/sysv/linux/m68k/chown.c 2006-06-01 11:36:57.000000000 +0200
+@@ -67,3 +67,8 @@
}
+ libc_hidden_def (__chown)
weak_alias (__chown, chown)
+
+#include <shlib-compat.h>
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2)
+compat_symbol (libc, __chown, chown, GLIBC_2_1);
+#endif
-diff -urN glibc-2.2.5.orig/sysdeps/unix/sysv/linux/m68k/lchown.c glibc-2.2.5/sysdeps/unix/sysv/linux/m68k/lchown.c
---- glibc-2.2.5.orig/sysdeps/unix/sysv/linux/m68k/lchown.c 2000-01-17 06:20:35.000000000 +0100
-+++ glibc-2.2.5/sysdeps/unix/sysv/linux/m68k/lchown.c 2002-08-11 15:38:56.000000000 +0200
+--- ports/sysdeps/unix/sysv/linux/m68k/lchown.c 2000-01-17 06:20:35.000000000 +0100
++++ ports/sysdeps/unix/sysv/linux/m68k/lchown.c 2006-06-01 11:36:57.000000000 +0200
@@ -1 +1,6 @@
#include <sysdeps/unix/sysv/linux/i386/lchown.c>
+
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -1,12 +1,11 @@
# DP: Make sure libc_nonshared.a is compiled with -fPIC on m68k
-diff -urN glibc-2.2.3.orig/sysdeps/m68k/Makefile glibc-2.2.3/sysdeps/m68k/Makefi
---- glibc-2.2.3.orig/sysdeps/m68k/Makefile Fri Sep 5 03:40:38 1997
-+++ glibc-2.2.3/sysdeps/m68k/Makefile Tue May 15 23:29:05 2001
-@@ -41,3 +41,7 @@
- # Avoid a bug in gcc
- CFLAGS-s_copysignl.c += -mnobitfield
+--- ports/sysdeps/m68k/Makefile 2006-06-01 11:20:48.000000000 +0200
++++ ports/sysdeps/m68k/Makefile 2006-06-01 11:37:21.000000000 +0200
+@@ -44,3 +44,7 @@
+ shared-only-routines += libgcc-compat
endif
+ endif
+
+# Build objects in libc_nonshared.a with -fPIC (instead of -fpic) to avoid
+# possible linkage problems.
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -1,5 +1,5 @@
---- libc/sysdeps/m68k/fpu/bits/mathinline.h 2006-03-03 15:22:14.000000000 +0100
-+++ libc/sysdeps/m68k/fpu/bits/mathinline.h 2006-04-07 00:41:04.000000000 +0200
+--- libc/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-03-03 15:22:14.000000000 +0100
++++ libc/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-04-07 00:41:04.000000000 +0200
@@ -100,7 +100,7 @@
/* Define a const math function. */
#define __m81_defun(rettype, func, args) \
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff 2006-06-01 10:17:01 UTC (rev 1601)
@@ -6,8 +6,8 @@
# DP: Status Details: Actual fix is to modify m68k binutils.
# DP: Date: 2004-08-09
---- glibc-2.3.2/sysdeps/m68k/dl-machine.h.org 2004-08-05 02:00:32.000000000 +0200
-+++ glibc-2.3.2/sysdeps/m68k/dl-machine.h 2004-08-05 02:01:07.000000000 +0200
+--- glibc-2.3.2/ports/ports/sysdeps/m68k/dl-machine.h.org 2004-08-05 02:00:32.000000000 +0200
++++ glibc-2.3.2/ports/ports/sysdeps/m68k/dl-machine.h 2004-08-05 02:01:07.000000000 +0200
@@ -310,6 +310,8 @@
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
if (ELF32_R_TYPE (reloc->r_info) == R_68K_JMP_SLOT)
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-31 05:22:40 UTC (rev 1600)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-06-01 10:17:01 UTC (rev 1601)
@@ -52,8 +52,8 @@
#arm/cvs-gcc4-inline.diff -p1
#arm/cvs-socket-weakalias.diff -p0
arm/local-dwarf2-buildfix.diff -p0
-#arm/local-ioperm.diff -p0
-#arm/local-no-hwcap.diff -p0
+arm/local-ioperm.diff -p0
+arm/local-no-hwcap.diff -p0
hppa/local-Rminkernel.diff -p0
hppa/submitted-drop-utimes.diff -p1
@@ -78,11 +78,11 @@
i386/local-cmov.diff -p0
i386/submitted-i686-timing.diff -p1
-#m68k/local-compat.diff -p1
+m68k/local-compat.diff -p0
m68k/local-dwarf2-buildfix.diff -p0
-#m68k/local-fpic.diff -p1
+m68k/local-fpic.diff -p0
#m68k/local-mathinline_h.diff -p1
-#m68k/local-reloc.diff -p1
+m68k/local-reloc.diff -p1
#m68k/submitted-gcc34-seccomment.diff -p0
mips/local-librt.diff -p0
Reply to: