diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makerules | 6 | ||||
| -rw-r--r-- | string/basename.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index bfa537b79e..720acbbb8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Tue Jun 11 15:09:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * string/basename.c (basename): Cast FILENAME to char * for return. + + * Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between + libc.so and libc.a in the deps. + * elf/Makefile ($(objpfx)$(rtld-installed-name)): New target to make link to ld.so if that is not the installed name. (lib-noranlib): Depend on the installed name in the build directory diff --git a/Makerules b/Makerules index 27053f31e8..ff6adcf9d2 100644 --- a/Makerules +++ b/Makerules @@ -595,9 +595,13 @@ ifndef subdir # table of the shared libc object. install: $(libdir)/libc.so $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \ + $(elfobjdir)/$(rtld-installed-name) \ $(common-objpfx)libc.a (echo '/* Use the shared library, but some functions are only in';\ - echo ' the static library, so try that secondarily. */';\ + echo ' the static library, so try that secondarily.'; \ + echo ' The dynamic linker defines some functions used by $(<F),';\ + echo ' but ld uses definitions from libc.a before the examining';\ + echo ' dependencies of $(<F) to find $(rtld-installed-name). */';\ echo 'GROUP ( $(^F) )') > $@.new mv -f $@.new $@ diff --git a/string/basename.c b/string/basename.c index 95bc003846..57a59542ca 100644 --- a/string/basename.c +++ b/string/basename.c @@ -23,5 +23,5 @@ char * basename (const char *filename) { char *p = strrchr (filename, '/'); - return p ? p + 1 : filename; + return p ? p + 1 : (char *) filename; } |