diff options
| author | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
| commit | 76fe441a7bf75d73962641b785f158b5cc9dc7f8 (patch) | |
| tree | 4e267e060bfb6d96f46ab0d79c49b277402c0dd0 /lib/csu/ia64 | |
| parent | 6085f75ded37ec415ded7d6373ecd09bcb088ac4 (diff) | |
| download | FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.zip FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.tar.gz | |
Do not use __progname directly (except in [gs]etprogname(3)).
Also, make an internal _getprogname() that is used only inside
libc. For libc, getprogname(3) is a weak symbol in case a
function of the same name is defined in userland.
Diffstat (limited to 'lib/csu/ia64')
| -rw-r--r-- | lib/csu/ia64/Makefile | 3 | ||||
| -rw-r--r-- | lib/csu/ia64/crt1.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile index 0ee91e0..5528e4e 100644 --- a/lib/csu/ia64/Makefile +++ b/lib/csu/ia64/Makefile @@ -6,7 +6,8 @@ SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o CFLAGS+= -Wall -Wno-unused \ - -I${.CURDIR}/../common + -I${.CURDIR}/../common \ + -I${.CURDIR}/../../libc/include NOMAN= true NOPIC= true NOPROFILE= true diff --git a/lib/csu/ia64/crt1.c b/lib/csu/ia64/crt1.c index 474bad8..4320b7b 100644 --- a/lib/csu/ia64/crt1.c +++ b/lib/csu/ia64/crt1.c @@ -36,6 +36,7 @@ #endif #include <stdlib.h> +#include "libc_private.h" #include "crtbrand.c" struct Struct_Obj_Entry; @@ -56,7 +57,7 @@ extern int etext; #endif char **environ; -char *__progname = ""; +const char *__progname = ""; /* The entry function. */ void @@ -67,6 +68,7 @@ _start(char **ap, int argc; char **argv; char **env; + const char *s; /* Calculate gp */ __asm __volatile(" \ @@ -82,7 +84,6 @@ _start(char **ap, env = ap + 2 + argc; environ = env; if (argc > 0 && argv[0] != NULL) { - char *s; __progname = argv[0]; for (s = __progname; *s != '\0'; s++) if (*s == '/') |
