diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-05 09:02:04 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-05 09:02:04 +0000 |
| commit | 045d873e22052b1951e71ebf599d27ac34607e3f (patch) | |
| tree | 4f50823f2b5d1156845c3e1a95a1acbd25fd3f69 /lib | |
| parent | 71c77f6d81939a0f287254ac7340ef74481bd47c (diff) | |
Do not have non-dynamic crt0 depend upon libc's strrchr() function on a.out.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csu/common.c | 6 | ||||
| -rw-r--r-- | lib/csu/common.h | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib/csu/common.c b/lib/csu/common.c index 6ad112512fc..074dfed451f 100644 --- a/lib/csu/common.c +++ b/lib/csu/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.12 2002/07/22 19:15:39 art Exp $ */ +/* $OpenBSD: common.c,v 1.13 2004/01/05 09:02:03 miod Exp $ */ /* $NetBSD: common.c,v 1.4 1995/09/23 22:34:20 pk Exp $ */ /* * Copyright (c) 1993,1995 Paul Kranenburg @@ -231,6 +231,8 @@ _getenv(name) } #endif +#endif /* DYNAMIC */ + static char * _strrchr(p, ch) register char *p, ch; @@ -245,5 +247,3 @@ register char *p, ch; } /* NOTREACHED */ } - -#endif /* DYNAMIC */ diff --git a/lib/csu/common.h b/lib/csu/common.h index 23d51f377a7..b2b4a3424ab 100644 --- a/lib/csu/common.h +++ b/lib/csu/common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: common.h,v 1.7 2003/02/28 18:05:48 deraadt Exp $ */ +/* $OpenBSD: common.h,v 1.8 2004/01/05 09:02:03 miod Exp $ */ /* $NetBSD: common.h,v 1.3 1995/06/15 21:41:48 pk Exp $ */ /* @@ -55,7 +55,6 @@ extern struct _dynamic _DYNAMIC; static void __load_rtld(struct _dynamic *); extern int __syscall(int, ...); int _callmain(void); -static char *_strrchr(char *, char); #ifdef DEBUG static char *_getenv(char *); static int _strncmp(char *, char *, int); @@ -83,6 +82,7 @@ static int _strncmp(char *, char *, int); #endif /* DYNAMIC */ +static char *_strrchr(char *, char); extern int main(int, char **, char **); #ifdef MCRT0 extern void monstartup(u_long, u_long); @@ -94,10 +94,6 @@ int errno; static char empty[1]; char *__progname = empty; char __progname_storage[NAME_MAX+1]; -#ifndef DYNAMIC -#define _strrchr strrchr -#endif extern unsigned char etext; extern unsigned char eprol asm ("eprol"); - |