[Glibc-bsd-commits] r1899 - in trunk/glibc-ports: kfreebsd patches

[Petr Salinger]

Author: ps-guest
Date: 2007-02-12 15:20:34 +0100 (Mon, 12 Feb 2007)
New Revision: 1899

Removed:
   trunk/glibc-ports/patches/amd64-dl-machine.diff
Modified:
   trunk/glibc-ports/kfreebsd/getcwd.c
Log:
* better fix for ld.so segfault on GNU/kFreeBSD amd64



Modified: trunk/glibc-ports/kfreebsd/getcwd.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getcwd.c	2007-02-12 11:19:01 UTC (rev 1898)
+++ trunk/glibc-ports/kfreebsd/getcwd.c	2007-02-12 14:20:34 UTC (rev 1899)
@@ -78,13 +78,18 @@
       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

Deleted: trunk/glibc-ports/patches/amd64-dl-machine.diff
===================================================================
--- trunk/glibc-ports/patches/amd64-dl-machine.diff	2007-02-12 11:19:01 UTC (rev 1898)
+++ trunk/glibc-ports/patches/amd64-dl-machine.diff	2007-02-12 14:20:34 UTC (rev 1899)
@@ -1,17 +0,0 @@
-
-* probably not kfreebsd specific bug, 
-  but I am not sure as ld.so loading is a little magic
-
-http://sourceware.org/bugzilla/show_bug.cgi?id=4018
-
---- 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