Title: [1990] trunk/uClibc: Upstream r19845 | vapier | 2007-09-15 11:12:59 +0200 (
Sat, 15 Sep 2007) | 1 line
- Revision
- 1990
- Author
- bernds
- Date
- 2007-11-22 18:54:40 -0600 (Thu, 22 Nov 2007)
Log Message
Upstream r19845 | vapier | 2007-09-15 11:12:59 +0200 (Sat, 15 Sep 2007) | 1 line
drop hidden aliases to data since some arches crap with this due to copy relocs
Diffstat
extra/Configs/Config.in | 1 +
libc/misc/internals/__uClibc_main.c | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 14 deletions(-)
Modified Paths
Diff
Modified: trunk/uClibc/extra/Configs/Config.in (1989 => 1990)
--- trunk/uClibc/extra/Configs/Config.in 2007-11-23 00:53:37 UTC (rev 1989)
+++ trunk/uClibc/extra/Configs/Config.in 2007-11-23 00:54:40 UTC (rev 1990)
@@ -502,6 +502,7 @@
config UCLIBC_HAS___PROGNAME
bool "Support for __progname"
default y
+ depends on UCLIBC_HAS_PROGRAM_INVOCATION_NAME
help
Some packages (like openssh) like to peek into internal libc
symbols to make their output a bit more user friendly.
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c (1989 => 1990)
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2007-11-23 00:53:37 UTC (rev 1989)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2007-11-23 00:54:40 UTC (rev 1990)
@@ -104,15 +104,15 @@
# endif
#endif
-attribute_hidden const char *__uclibc_progname = NULL;
-#ifdef __UCLIBC_HAS___PROGNAME__
-strong_alias (__uclibc_progname, __progname)
-#endif
+attribute_hidden const char *__uclibc_progname = "";
#ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-attribute_hidden const char *__progname_full = NULL;
-strong_alias (__uclibc_progname, program_invocation_short_name)
-strong_alias (__progname_full, program_invocation_name)
+const char *program_invocation_short_name = "";
+const char *program_invocation_name = "";
#endif
+#ifdef __UCLIBC_HAS___PROGNAME__
+weak_alias (program_invocation_short_name, __progname)
+weak_alias (program_invocation_name, __progname_full)
+#endif
/*
* Declare the __environ global variable and create a strong alias environ.
@@ -337,15 +337,14 @@
}
#endif
+ __uclibc_progname = *argv;
#ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
- __progname_full = *argv;
- __progname = strrchr(*argv, '/');
- if (__progname != NULL)
- ++__progname;
+ program_invocation_name = *argv;
+ program_invocation_short_name = strrchr(*argv, '/');
+ if (program_invocation_short_name != NULL)
+ ++program_invocation_short_name;
else
- __progname = __progname_full;
-#else
- __uclibc_progname = *argv;
+ program_invocation_short_name = program_invocation_name;
#endif
#ifdef __UCLIBC_CTOR_DTOR__
_______________________________________________
Toolchain-commits mailing list
Toolchain-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/toolchain-commits
