oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify (and fix) NBSD libc's weak references of getcwd.

Browse Source
This commit is contained in:
Gianluca Guida 2011-02-22 09:08:24 +00:00
parent 0b920bb1cd
commit 8aa9382e58
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nbsd_libc/gen/getcwd.c
View File

@ -54,8 +54,12 @@ __RCSID("$NetBSD: getcwd.c,v 1.47 2011/01/20 02:57:00 christos Exp $");
#include "extern.h" #include "extern.h"
#ifdef __weak_alias #ifdef __weak_alias
#ifdef __minix
__weak_alias(getcwd,_getcwd)
#else
__weak_alias(getcwd,_sys_getcwd) __weak_alias(getcwd,_sys_getcwd)
__weak_alias(_getcwd,_sys_getcwd) __weak_alias(_getcwd,_sys_getcwd)
#endif
__weak_alias(realpath,_realpath) __weak_alias(realpath,_realpath)
#if defined(_FORTIFY_SOURCE) && !defined(__lint__) #if defined(_FORTIFY_SOURCE) && !defined(__lint__)

16
lib/nbsd_libc/minix-port.patch
View File

@ -457,6 +457,22 @@ diff -ru /home/netbsd/src/lib/libc/gen/fts.c ./gen/fts.c
static FTSENT *fts_alloc(FTS *, const char *, size_t); static FTSENT *fts_alloc(FTS *, const char *, size_t);
static FTSENT *fts_build(FTS *, int); static FTSENT *fts_build(FTS *, int);
diff -ru /home/netbsd/src/lib/libc/gen/getcwd.c ./gen/getcwd.c
--- /home/netbsd/src/lib/libc/gen/getcwd.c 2011-01-20 03:02:11.000000000 +0000
+++ ./gen/getcwd.c 2011-02-21 14:27:44.000000000 +0000
@@ -54,8 +54,12 @@
#include "extern.h"
#ifdef __weak_alias
+#ifdef __minix
+__weak_alias(getcwd,_getcwd)
+#else
__weak_alias(getcwd,_sys_getcwd)
__weak_alias(_getcwd,_sys_getcwd)
+#endif
__weak_alias(realpath,_realpath)
#if defined(_FORTIFY_SOURCE) && !defined(__lint__)
diff -ru /home/netbsd/src/lib/libc/gen/getgrent.c ./gen/getgrent.c diff -ru /home/netbsd/src/lib/libc/gen/getgrent.c ./gen/getgrent.c
--- /home/netbsd/src/lib/libc/gen/getgrent.c 2008-04-28 20:22:59.000000000 +0000 --- /home/netbsd/src/lib/libc/gen/getgrent.c 2008-04-28 20:22:59.000000000 +0000
+++ ./gen/getgrent.c 2011-02-15 10:00:10.000000000 +0000 +++ ./gen/getgrent.c 2011-02-15 10:00:10.000000000 +0000