r1985 - in glibc-package/branches/glibc-2.5/debian: . patches patches/kfreebsd
Author: aurel32
Date: 2007-02-12 18:04:35 +0100 (Mon, 12 Feb 2007)
New Revision: 1985
Removed:
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64
Log:
Remove kfreebsd/local-amd64-dl-machine.diff
Update kfreebsd/local-sysdeps.diff from glibc-bsd revision r1900.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-12 14:51:10 UTC (rev 1984)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-12 17:04:35 UTC (rev 1985)
@@ -112,8 +112,6 @@
__libc_once_else to make glibc buildable on Hurd).
* hurd-i386/local-msg-nosignal.diff: new patch from Thomas Schwinge
(workaround the missing MSG_NOSIGNAL support).
- * kfreebsd/local-amd64-dl-machine.diff: new patch from Petr Salinger (fix
- ld.so segfault on GNU/kFreeBSD amd64).
* m68k/cvs-m68k-update.diff: new patch (bits from CVS). Closes: #364098.
* any/submitted-clock-settime.diff: new patch (include <time.h> to get
clockid_t).
Deleted: glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff 2007-02-12 14:51:10 UTC (rev 1984)
+++ glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-amd64-dl-machine.diff 2007-02-12 17:04:35 UTC (rev 1985)
@@ -1,16 +0,0 @@
-
-* probably not kfreebsd specific bug,
- but I am not sure as ld.so loading is a little magic
-
-
---- sysdeps/x86_64/dl-machine.h 2005-07-31 19:49:44.000000000 +0200
-+++ sysdeps/x86_64/dl-machine.h 2007-02-08 18:14:56.000000000 +0100
-@@ -286,7 +283,7 @@
- const Elf64_Sym *const refsym = sym;
- #endif
- struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
-- Elf64_Addr value = (sym == NULL ? 0
-+ Elf64_Addr value = (sym_map == NULL ? 0
- : (Elf64_Addr) sym_map->l_addr + sym->st_value);
-
- #if defined RTLD_BOOTSTRAP && !USE___THREAD
Modified: glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff 2007-02-12 14:51:10 UTC (rev 1984)
+++ glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff 2007-02-12 17:04:35 UTC (rev 1985)
@@ -6794,7 +6794,7 @@
+weak_alias (__clone, clone)
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure 2007-01-05 11:36:38.000000000 +0100
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure 2007-02-08 21:21:06.000000000 +0100
@@ -0,0 +1,342 @@
+# This file is generated from configure.in by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/bsd/bsd4.4/kfreebsd.
@@ -6802,7 +6802,7 @@
+case "$machine" in
+ x86_64*)
+ echo "Adding extra sysnames for kfreebsd/x86_64/elf"
-+ sysnames="sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/elf $sysnames"
++ sysnames="ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/elf $sysnames"
+ ;;
+esac
+
@@ -7140,7 +7140,7 @@
+fi
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in 2007-01-05 11:36:38.000000000 +0100
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in 2007-02-08 21:21:06.000000000 +0100
@@ -0,0 +1,268 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/bsd/bsd4.4/kfreebsd.
@@ -7148,7 +7148,7 @@
+case "$machine" in
+ x86_64*)
+ echo "Adding extra sysnames for kfreebsd/x86_64/elf"
-+ sysnames="sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/elf $sysnames"
++ sysnames="ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/elf $sysnames"
+ ;;
+esac
+
@@ -8199,8 +8199,8 @@
+hidden_def (__fxstat64)
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c 2006-10-18 09:59:59.000000000 +0200
-@@ -0,0 +1,90 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c 2007-02-12 17:35:20.000000000 +0100
+@@ -0,0 +1,95 @@
+/* Determine current working directory. FreeBSD version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -8281,16 +8281,21 @@
+ memcpy (buf, tmpbuf, len);
+ return buf;
+ }
-+
++#if IS_IN_rtld
++ return NULL;
++#else
+ return generic_getcwd (buf, size);
++#endif
+}
+
+weak_alias (__getcwd, getcwd)
+
++#if !IS_IN_rtld
+/* Get the code for the generic version. */
+#define GETCWD_RETURN_TYPE static char * internal_function
+#define __getcwd generic_getcwd
+#include <sysdeps/posix/getcwd.c>
++#endif
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdents.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdents.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdents.c 1970-01-01 01:00:00.000000000 +0100
+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdents.c 2006-10-18 09:59:59.000000000 +0200
@@ -17246,8 +17251,8 @@
+#endif /* _SYS_MOUNT_H */
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h 2006-10-18 09:59:57.000000000 +0200
-@@ -0,0 +1,236 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h 2007-02-12 17:35:20.000000000 +0100
+@@ -0,0 +1,237 @@
+/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -17308,6 +17313,7 @@
+#define NOGROUP 65535 /* marker for empty group set member */
+#define MAXHOSTNAMELEN 256 /* max hostname size */
+#define SPECNAMELEN 63 /* max length of devicename */
++#define TTY_NAME_MAX SPECNAMELEN
+
+/* BSD names for some <limits.h> values. */
+
Modified: glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64 2007-02-12 14:51:10 UTC (rev 1984)
+++ glibc-package/branches/glibc-2.5/debian/patches/series.kfreebsd-amd64 2007-02-12 17:04:35 UTC (rev 1985)
@@ -1,4 +1,3 @@
-kfreebsd/local-amd64-dl-machine.diff -p0
kfreebsd/local-ftw.diff -p0
kfreebsd/local-memusage_no_mremap.diff -p0
kfreebsd/local-pthread_at_fork.diff -p0
Reply to: