r1546 - in glibc-package/branches/glibc-2.4/debian: . patches patches/hppa patches/mips
Author: aurel32
Date: 2006-05-28 09:31:52 +0000 (Sun, 28 May 2006)
New Revision: 1546
Removed:
glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-linesep.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/submitted-fenv-align.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.
* Update mips/submitted-msq.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-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 09:31:52 UTC (rev 1546)
@@ -58,10 +58,16 @@
* Remove any/cvs-nfs_h.diff (merged upstream).
* Remove any/cvs-path_log.diff (merged upstream).
* Remove any/local-kernel-features.diff (merged upstream).
+ * Remove hppa/cvs-linesep.diff (merged upstream).
+ * Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
* Remove hurd-i386/cvs-posix-opts.diff (merged upstream).
- * Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
* Update hurd-i386/submitted-sysvshm.diff.
* Remove m32r/cvs-elf-m32r_rel32.diff (merged upstream).
+ * 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.
+ * Update mips/submitted-msq.diff to reflect the new port add-on.
+ * Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-linesep.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-linesep.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-linesep.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -1,42 +0,0 @@
-# DP: Description: Fix ASM_LINE_SEP on hppa
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-03-08
-
-2005-03-08 GOTO Masanori <gotom@debian.or.jp>
-
- * sysdeps/hppa/configure.in: Remove old Makefile leavings.
- * sysdeps/hppa/configure: Regenerated.
-
-Index: sysdeps/hppa/configure.in
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/hppa/configure.in,v
-retrieving revision 1.1
-diff -u -p -r1.1 configure.in
---- sysdeps/hppa/configure.in 26 Oct 2004 01:35:53 -0000 1.1
-+++ sysdeps/hppa/configure.in 8 Mar 2005 04:29:14 -0000
-@@ -2,7 +2,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the
-
- dnl The standard hppa assembler uses `;' to start comments and `!'
- dnl as a line separator.
--hppa*linux*)
- AC_CACHE_CHECK(for assembler line separator,
- libc_cv_asm_line_sep, [dnl
- cat > conftest.s <<EOF
-Index: sysdeps/hppa/configure
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/hppa/configure,v
-retrieving revision 1.1
-diff -u -p -r1.1 configure
---- sysdeps/hppa/configure 26 Oct 2004 01:35:53 -0000 1.1
-+++ sysdeps/hppa/configure 8 Mar 2005 04:29:14 -0000
-@@ -1,6 +1,5 @@
- # This file is generated from configure.in by Autoconf. DO NOT EDIT!
-
--hppa*linux*)
- echo "$as_me:$LINENO: checking for assembler line separator" >&5
- echo $ECHO_N "checking for assembler line separator... $ECHO_C" >&6
- if test "${libc_cv_asm_line_sep+set}" = set; then
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -4,9 +4,9 @@
# DP: Upstream status: Not submitted (yet)
# DP: Date: 2005-10-14
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fclrexcpt.c glibc-2.3.5/sysdeps/hppa/fpu/fclrexcpt.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fclrexcpt.c 2003-12-18 03:56:15.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fclrexcpt.c 2005-10-14 17:44:33.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fclrexcpt.c ports/sysdeps/hppa/fpu/fclrexcpt.c
+--- ports/sysdeps/hppa.bak/fpu/fclrexcpt.c 2003-12-18 03:56:15.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fclrexcpt.c 2005-10-14 17:44:33.000000000 +0000
@@ -23,14 +23,14 @@
int
feclearexcept (int excepts)
@@ -26,9 +26,9 @@
/* Success. */
return 0;
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fedisblxcpt.c glibc-2.3.5/sysdeps/hppa/fpu/fedisblxcpt.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fedisblxcpt.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fedisblxcpt.c 2005-10-14 17:48:10.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fedisblxcpt.c ports/sysdeps/hppa/fpu/fedisblxcpt.c
+--- ports/sysdeps/hppa.bak/fpu/fedisblxcpt.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fedisblxcpt.c 2005-10-14 17:48:10.000000000 +0000
@@ -23,15 +23,16 @@
int
fedisableexcept (int excepts)
@@ -51,9 +51,9 @@
return old_exc;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/feenablxcpt.c glibc-2.3.5/sysdeps/hppa/fpu/feenablxcpt.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/feenablxcpt.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/feenablxcpt.c 2005-10-14 17:48:46.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/feenablxcpt.c ports/sysdeps/hppa/fpu/feenablxcpt.c
+--- ports/sysdeps/hppa.bak/fpu/feenablxcpt.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/feenablxcpt.c 2005-10-14 17:48:46.000000000 +0000
@@ -23,15 +23,16 @@
int
feenableexcept (int excepts)
@@ -76,9 +76,9 @@
return old_exc;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetenv.c 2003-12-18 03:56:50.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c 2005-10-14 18:10:42.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fegetenv.c ports/sysdeps/hppa/fpu/fegetenv.c
+--- ports/sysdeps/hppa.bak/fpu/fegetenv.c 2003-12-18 03:56:50.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fegetenv.c 2005-10-14 18:10:42.000000000 +0000
@@ -19,15 +19,19 @@
02111-1307 USA. */
@@ -100,9 +100,9 @@
+ memcpy (envp, buf, sizeof (*envp));
return 0;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetexcept.c glibc-2.3.5/sysdeps/hppa/fpu/fegetexcept.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetexcept.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fegetexcept.c 2005-10-14 17:49:08.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fegetexcept.c ports/sysdeps/hppa/fpu/fegetexcept.c
+--- ports/sysdeps/hppa.bak/fpu/fegetexcept.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fegetexcept.c 2005-10-14 17:49:08.000000000 +0000
@@ -23,10 +23,10 @@
int
fegetexcept (void)
@@ -117,9 +117,9 @@
- return sw[0] & FE_ALL_EXCEPT;
+ return s.sw[0] & FE_ALL_EXCEPT;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetround.c glibc-2.3.5/sysdeps/hppa/fpu/fegetround.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fegetround.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fegetround.c 2005-10-14 17:49:28.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fegetround.c ports/sysdeps/hppa/fpu/fegetround.c
+--- ports/sysdeps/hppa.bak/fpu/fegetround.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fegetround.c 2005-10-14 17:49:28.000000000 +0000
@@ -23,10 +23,10 @@
int
fegetround (void)
@@ -134,9 +134,9 @@
- return sw[0] & FE_DOWNWARD;
+ return s.sw[0] & FE_DOWNWARD;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/feholdexcpt.c glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/feholdexcpt.c 2004-02-21 02:10:01.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c 2005-10-14 18:14:13.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/feholdexcpt.c ports/sysdeps/hppa/fpu/feholdexcpt.c
+--- ports/sysdeps/hppa.bak/fpu/feholdexcpt.c 2004-02-21 02:10:01.000000000 +0000
++++ ports/sysdeps/hppa/fpu/feholdexcpt.c 2005-10-14 18:14:13.000000000 +0000
@@ -24,33 +24,34 @@
int
feholdexcept (fenv_t *envp)
@@ -181,9 +181,9 @@
return 0;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fesetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fesetenv.c 2003-12-18 03:57:31.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c 2005-10-14 18:14:21.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fesetenv.c ports/sysdeps/hppa/fpu/fesetenv.c
+--- ports/sysdeps/hppa.bak/fpu/fesetenv.c 2003-12-18 03:57:31.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fesetenv.c 2005-10-14 18:14:21.000000000 +0000
@@ -25,40 +25,42 @@
int
fesetenv (const fenv_t *envp)
@@ -239,9 +239,9 @@
/* Success. */
return 0;
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fesetround.c glibc-2.3.5/sysdeps/hppa/fpu/fesetround.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fesetround.c 2002-12-03 02:50:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fesetround.c 2005-10-14 17:58:24.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fesetround.c ports/sysdeps/hppa/fpu/fesetround.c
+--- ports/sysdeps/hppa.bak/fpu/fesetround.c 2002-12-03 02:50:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fesetround.c 2005-10-14 17:58:24.000000000 +0000
@@ -23,17 +23,17 @@
int
fesetround (int round)
@@ -265,9 +265,9 @@
return 0;
}
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/feupdateenv.c glibc-2.3.5/sysdeps/hppa/fpu/feupdateenv.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/feupdateenv.c 2004-04-17 22:51:43.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/feupdateenv.c 2005-10-14 18:10:40.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/feupdateenv.c ports/sysdeps/hppa/fpu/feupdateenv.c
+--- ports/sysdeps/hppa.bak/fpu/feupdateenv.c 2004-04-17 22:51:43.000000000 +0000
++++ ports/sysdeps/hppa/fpu/feupdateenv.c 2005-10-14 18:10:40.000000000 +0000
@@ -19,18 +19,19 @@
02111-1307 USA. */
@@ -291,9 +291,9 @@
/* Success. */
return 0;
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fgetexcptflg.c glibc-2.3.5/sysdeps/hppa/fpu/fgetexcptflg.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fgetexcptflg.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fgetexcptflg.c 2005-10-14 17:57:37.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fgetexcptflg.c ports/sysdeps/hppa/fpu/fgetexcptflg.c
+--- ports/sysdeps/hppa.bak/fpu/fgetexcptflg.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fgetexcptflg.c 2005-10-14 17:57:37.000000000 +0000
@@ -23,12 +23,12 @@
int
fegetexceptflag (fexcept_t *flagp, int excepts)
@@ -310,9 +310,9 @@
/* Success. */
return 0;
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/fsetexcptflg.c glibc-2.3.5/sysdeps/hppa/fpu/fsetexcptflg.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/fsetexcptflg.c 2003-12-18 03:58:26.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fsetexcptflg.c 2005-10-14 17:57:28.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/fsetexcptflg.c ports/sysdeps/hppa/fpu/fsetexcptflg.c
+--- ports/sysdeps/hppa.bak/fpu/fsetexcptflg.c 2003-12-18 03:58:26.000000000 +0000
++++ ports/sysdeps/hppa/fpu/fsetexcptflg.c 2005-10-14 17:57:28.000000000 +0000
@@ -24,16 +24,16 @@
int
fesetexceptflag (const fexcept_t *flagp, int excepts)
@@ -334,9 +334,9 @@
/* Success. */
return 0;
-diff -ur glibc-2.3.5/sysdeps/hppa.bak/fpu/ftestexcept.c glibc-2.3.5/sysdeps/hppa/fpu/ftestexcept.c
---- glibc-2.3.5/sysdeps/hppa.bak/fpu/ftestexcept.c 2001-07-06 04:55:52.000000000 +0000
-+++ glibc-2.3.5/sysdeps/hppa/fpu/ftestexcept.c 2005-10-14 18:10:05.000000000 +0000
+diff -ur ports/sysdeps/hppa.bak/fpu/ftestexcept.c ports/sysdeps/hppa/fpu/ftestexcept.c
+--- ports/sysdeps/hppa.bak/fpu/ftestexcept.c 2001-07-06 04:55:52.000000000 +0000
++++ ports/sysdeps/hppa/fpu/ftestexcept.c 2005-10-14 18:10:05.000000000 +0000
@@ -23,10 +23,10 @@
int
fetestexcept (int excepts)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -1,92 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on mips for inline
-# functions of dl-machine.h.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS / Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-17
-
-2005-07-17 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/mips/dl-machine.h: Use auto inline.
-
---- sysdeps/mips/dl-machine.h 2005-07-17 00:36:51.000000000 +0900
-+++ sysdeps/mips/dl-machine.h.new 2005-07-17 00:40:18.000000000 +0900
-@@ -528,7 +528,11 @@
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
- MAP is the object containing the reloc. */
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
- #ifdef RTLD_BOOTSTRAP
- __attribute__ ((always_inline))
- #endif
-@@ -635,14 +639,28 @@
- }
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
- void *const reloc_addr)
- {
- /* XXX Nothing to do. There is no relative relocation, right? */
- }
-
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_lazy_rel (struct link_map *map,
- ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
- {
-@@ -651,7 +669,14 @@
-
- #ifndef RTLD_BOOTSTRAP
- /* Relocate GOT. */
--static inline void
-+#if __GNUC__ >= 4
-+ auto inline void
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_got_rel (struct link_map *map, int lazy)
- {
- ElfW(Addr) *got;
-@@ -738,7 +763,14 @@
- /* Set up the loaded object described by L so its stub function
- will jump to the on-demand fixup code __dl_runtime_resolve. */
-
--static inline int
-+#if __GNUC__ >= 4
-+ auto inline int
-+#else
-+ static inline int
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
- {
- # ifndef RTLD_BOOTSTRAP
Deleted: glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -1,420 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on mips for
-# the breakage of large syscall arguments handling.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Daniel Jacobowitz <dan@codesourcery.com>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-07-17
-
-2005-03-28 Daniel Jacobowitz <dan@codesourcery.com>
-
- * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
- (INTERNAL_SYSCALL_NCS): New.
- (INTERNAL_SYSCALL): Update for non-constant support.
- (internal_syscall0): Likewise.
- (internal_syscall1): Likewise.
- (internal_syscall2): Likewise.
- (internal_syscall3): Likewise.
- (internal_syscall4): Likewise.
- (internal_syscall5): Likewise.
- (internal_syscall6): Likewise.
- (internal_syscall7): Likewise.
-
-2005-03-28 Daniel Jacobowitz <dan@codesourcery.com>
-
- * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
- (internal_syscall5): Use register operands instead of non-lvalue
- memory operands.
- (internal_syscall6): Likewise.
- (internal_syscall7): Likewise.
-
-Index: sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h,v
-retrieving revision 1.2
-retrieving revision 1.4
-diff -u -p -r1.2 -r1.4
---- sysdeps/unix/sysv/linux/mips/mips32/sysdep.h 18 Oct 2004 05:16:06 -0000 1.2
-+++ sysdeps/unix/sysv/linux/mips/mips32/sysdep.h 28 Mar 2005 09:17:26 -0000 1.4
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
-+/* Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -48,12 +48,12 @@
- #undef INLINE_SYSCALL
- #define INLINE_SYSCALL(name, nr, args...) \
- ({ INTERNAL_SYSCALL_DECL(err); \
-- long result_var = INTERNAL_SYSCALL (name, err, nr, args); \
-- if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \
-- { \
-- __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, err)); \
-- result_var = -1L; \
-- } \
-+ long result_var = INTERNAL_SYSCALL (name, err, nr, args); \
-+ if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) ) \
-+ { \
-+ __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, err)); \
-+ result_var = -1L; \
-+ } \
- result_var; })
-
- #undef INTERNAL_SYSCALL_DECL
-@@ -66,209 +66,218 @@
- #define INTERNAL_SYSCALL_ERRNO(val, err) (val)
-
- #undef INTERNAL_SYSCALL
--#define INTERNAL_SYSCALL(name, err, nr, args...) internal_syscall##nr(name, err, args)
-+#define INTERNAL_SYSCALL(name, err, nr, args...) \
-+ internal_syscall##nr (, "li\t$2, %2\t\t\t# " #name "\n\t", \
-+ "i" (SYS_ify (name)), err, args)
-+
-+#undef INTERNAL_SYSCALL_NCS
-+#define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \
-+ internal_syscall##nr (= number, , "r" (__v0), err, args)
-
--#define internal_syscall0(name, err, dummy...) \
--({ \
-+#define internal_syscall0(ncs_init, cs_init, input, err, dummy...) \
-+({ \
- long _sys_result; \
- \
- { \
-- register long __v0 asm("$2"); \
-- register long __a3 asm("$7"); \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "li\t$2, %2\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- ".set reorder" \
-- : "=r" (__v0), "=r" (__a3) \
-- : "i" (SYS_ify(name)) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a3 asm("$7"); \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ ".set reorder" \
-+ : "=r" (__v0), "=r" (__a3) \
-+ : input \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall1(name, err, arg1) \
--({ \
-+#define internal_syscall1(ncs_init, cs_init, input, err, arg1) \
-+({ \
- long _sys_result; \
- \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a3 asm("$7"); \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "li\t$2, %3\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- ".set reorder" \
-- : "=r" (__v0), "=r" (__a3) \
-- : "r" (__a0), "i" (SYS_ify(name)) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a3 asm("$7"); \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ ".set reorder" \
-+ : "=r" (__v0), "=r" (__a3) \
-+ : input, "r" (__a0) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall2(name, err, arg1, arg2) \
--({ \
-+#define internal_syscall2(ncs_init, cs_init, input, err, arg1, arg2) \
-+({ \
- long _sys_result; \
- \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a3 asm("$7"); \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "li\t$2, %4\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "=r" (__a3) \
-- : "r" (__a0), "r" (__a1), "i" (SYS_ify(name)) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a3 asm("$7"); \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "=r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall3(name, err, arg1, arg2, arg3) \
--({ \
-+#define internal_syscall3(ncs_init, cs_init, input, err, arg1, arg2, arg3)\
-+({ \
- long _sys_result; \
- \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a2 asm("$6") = (long) arg3; \
-- register long __a3 asm("$7"); \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "li\t$2, %5\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "=r" (__a3) \
-- : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a2 asm("$6") = (long) arg3; \
-+ register long __a3 asm("$7"); \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "=r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1), "r" (__a2) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall4(name, err, arg1, arg2, arg3, arg4) \
--({ \
-+#define internal_syscall4(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4)\
-+({ \
- long _sys_result; \
- \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a2 asm("$6") = (long) arg3; \
-- register long __a3 asm("$7") = (long) arg4; \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "li\t$2, %5\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "+r" (__a3) \
-- : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a2 asm("$6") = (long) arg3; \
-+ register long __a3 asm("$7") = (long) arg4; \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "+r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1), "r" (__a2) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall5(name, err, arg1, arg2, arg3, arg4, arg5) \
--({ \
-+/* We need to use a frame pointer for the functions in which we
-+ adjust $sp around the syscall, or debug information and unwind
-+ information will be $sp relative and thus wrong during the syscall. As
-+ of GCC 3.4.3, this is sufficient. */
-+#define FORCE_FRAME_POINTER alloca (4)
-+
-+#define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\
-+({ \
- long _sys_result; \
- \
-+ FORCE_FRAME_POINTER; \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a2 asm("$6") = (long) arg3; \
-- register long __a3 asm("$7") = (long) arg4; \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "lw\t$2, %6\n\t" \
-- "subu\t$29, 32\n\t" \
-- "sw\t$2, 16($29)\n\t" \
-- "li\t$2, %5\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- "addiu\t$29, 32\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "+r" (__a3) \
-- : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \
-- "m" ((long)arg5) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a2 asm("$6") = (long) arg3; \
-+ register long __a3 asm("$7") = (long) arg4; \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "subu\t$29, 32\n\t" \
-+ "sw\t%6, 16($29)\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ "addiu\t$29, 32\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "+r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1), "r" (__a2), \
-+ "r" ((long)arg5) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall6(name, err, arg1, arg2, arg3, arg4, arg5, arg6)\
--({ \
-+#define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6)\
-+({ \
- long _sys_result; \
- \
-+ FORCE_FRAME_POINTER; \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a2 asm("$6") = (long) arg3; \
-- register long __a3 asm("$7") = (long) arg4; \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "lw\t$2, %6\n\t" \
-- "lw\t$8, %7\n\t" \
-- "subu\t$29, 32\n\t" \
-- "sw\t$2, 16($29)\n\t" \
-- "sw\t$8, 20($29)\n\t" \
-- "li\t$2, %5\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- "addiu\t$29, 32\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "+r" (__a3) \
-- : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \
-- "m" ((long)arg5), "m" ((long)arg6) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a2 asm("$6") = (long) arg3; \
-+ register long __a3 asm("$7") = (long) arg4; \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "subu\t$29, 32\n\t" \
-+ "sw\t%6, 16($29)\n\t" \
-+ "sw\t%7, 20($29)\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ "addiu\t$29, 32\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "+r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1), "r" (__a2), \
-+ "r" ((long)arg5), "r" ((long)arg6) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
- _sys_result; \
- })
-
--#define internal_syscall7(name, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\
--({ \
-+#define internal_syscall7(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\
-+({ \
- long _sys_result; \
- \
-+ FORCE_FRAME_POINTER; \
- { \
-- register long __v0 asm("$2"); \
-- register long __a0 asm("$4") = (long) arg1; \
-- register long __a1 asm("$5") = (long) arg2; \
-- register long __a2 asm("$6") = (long) arg3; \
-- register long __a3 asm("$7") = (long) arg4; \
-- __asm__ volatile ( \
-- ".set\tnoreorder\n\t" \
-- "lw\t$2, %6\n\t" \
-- "lw\t$8, %7\n\t" \
-- "lw\t$9, %8\n\t" \
-- "subu\t$29, 32\n\t" \
-- "sw\t$2, 16($29)\n\t" \
-- "sw\t$8, 20($29)\n\t" \
-- "sw\t$9, 24($29)\n\t" \
-- "li\t$2, %5\t\t\t# " #name "\n\t" \
-- "syscall\n\t" \
-- "addiu\t$29, 32\n\t" \
-- ".set\treorder" \
-- : "=r" (__v0), "+r" (__a3) \
-- : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \
-- "m" ((long)arg5), "m" ((long)arg6), "m" ((long)arg7) \
-- : __SYSCALL_CLOBBERS); \
-+ register long __v0 asm("$2") ncs_init; \
-+ register long __a0 asm("$4") = (long) arg1; \
-+ register long __a1 asm("$5") = (long) arg2; \
-+ register long __a2 asm("$6") = (long) arg3; \
-+ register long __a3 asm("$7") = (long) arg4; \
-+ __asm__ volatile ( \
-+ ".set\tnoreorder\n\t" \
-+ "subu\t$29, 32\n\t" \
-+ "sw\t%6, 16($29)\n\t" \
-+ "sw\t%7, 20($29)\n\t" \
-+ "sw\t%8, 24($29)\n\t" \
-+ cs_init \
-+ "syscall\n\t" \
-+ "addiu\t$29, 32\n\t" \
-+ ".set\treorder" \
-+ : "=r" (__v0), "+r" (__a3) \
-+ : input, "r" (__a0), "r" (__a1), "r" (__a2), \
-+ "r" ((long)arg5), "r" ((long)arg6), "r" ((long)arg7) \
-+ : __SYSCALL_CLOBBERS); \
- err = __a3; \
- _sys_result = __v0; \
- } \
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -6,12 +6,12 @@
# DP: Patch author: Guido Guenther <agx@debian.org>, GOTO Masanori <gotom@debian.org>
# DP: Upstream status: Debian-Specific
# DP: Status Details: debian-specific, until etch will be released.
-# DP: Date: 2004-12-24 (updated)
+# DP: Date: 2006-05-28 (updated)
---- sysdeps/unix/sysv/linux/mips/Versions.orig Tue Sep 24 15:56:55 2002
-+++ sysdeps/unix/sysv/linux/mips/Versions Tue Sep 24 15:49:27 2002
-@@ -34,3 +34,9 @@
- _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+--- ports/sysdeps/unix/sysv/linux/mips/Versions.orig Tue Sep 24 15:56:55 2002
++++ ports/sysdeps/unix/sysv/linux/mips/Versions Tue Sep 24 15:49:27 2002
+@@ -29,3 +29,9 @@
+ _test_and_set;
}
}
+librt {
@@ -63,7 +63,7 @@
int retval;
--- /dev/null 2004-09-27 19:55:25.000000000 +0900
-+++ sysdeps/unix/sysv/linux/mips/clock_settime.c 2004-12-23 12:07:36.000000000 +0900
++++ ports/sysdeps/unix/sysv/linux/mips/clock_settime.c 2004-12-23 12:07:36.000000000 +0900
@@ -0,0 +1,18 @@
+/*
+ * It adds for debian specific librt-mips binary incompatibility problems.
@@ -84,7 +84,7 @@
+#endif
+versioned_symbol (librt, __clock_settime, clock_settime, GLIBC_2_2);
--- /dev/null 2004-09-27 19:55:25.000000000 +0900
-+++ sysdeps/unix/sysv/linux/mips/clock_gettime.c 2004-12-23 12:07:35.000000000 +0900
++++ ports/sysdeps/unix/sysv/linux/mips/clock_gettime.c 2004-12-23 12:07:35.000000000 +0900
@@ -0,0 +1,18 @@
+/*
+ * It adds for debian specific librt-mips binary incompatibility problems.
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff 2006-05-28 09:31:52 UTC (rev 1546)
@@ -3,13 +3,13 @@
# DP: Author: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
# DP: Upstream status: Pending
-Index: sysdeps/unix/sysv/linux/mips/bits/msq.h
+Index: ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/msq.h,v
+RCS file: /cvs/glibc/libc/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h,v
retrieving revision 1.1
diff -a -d -u -p -r1.1 msq.h
---- sysdeps/unix/sysv/linux/mips/bits/msq.h 26 Aug 2002 01:49:55 -0000 1.1
-+++ sysdeps/unix/sysv/linux/mips/bits/msq.h 7 Oct 2003 18:30:30 -0000
+--- ports/sysdeps/unix/sysv/linux/mips/bits/msq.h 26 Aug 2002 01:49:55 -0000 1.1
++++ ports/sysdeps/unix/sysv/linux/mips/bits/msq.h 7 Oct 2003 18:30:30 -0000
@@ -38,16 +38,34 @@ typedef unsigned long int msglen_t;
struct msqid_ds
{
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 01:28:43 UTC (rev 1545)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 09:31:52 UTC (rev 1546)
@@ -56,13 +56,12 @@
hppa/local-Rminkernel.diff -p0
#hppa/submitted-drop-utimes.diff -p1
-#hppa/cvs-linesep.diff -p0
#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
hppa/submitted-lt.diff -p1
#hppa/submitted-sysdeps.diff -p1
#hppa/local-gcc-4-profile.diff -p0
#hppa/submitted-iitlbp.diff -p1
-#hppa/submitted-fenv-align.diff -p1
+hppa/submitted-fenv-align.diff -p0
#hppa/submitted-fpu.diff -p1
#hppa/cvs-pie-relocs.diff -p1
#hppa/cvs-no-ldbl-128.diff -p1
@@ -89,11 +88,9 @@
#m68k/local-reloc.diff -p1
#m68k/submitted-gcc34-seccomment.diff -p0
-#mips/cvs-gcc4-inline.diff -p0
-#mips/cvs-gcc4-sysdeps.diff -p0
#mips/local-librt.diff -p0
mips/local-lazy-eval.diff -p2
-#mips/submitted-msq.diff -p0
+mips/submitted-msq.diff -p0
powerpc/local-sysconf.diff -p1
Reply to: