AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* string/basename.c (basename): Cast FILENAME to char * for return.

Browse Source 
* Makerules ($(libdir)/libc.so): Put $(rtld-installed) name between
	libc.so and libc.a in the deps.
This commit is contained in:
Roland McGrath 1996-06-11 21:33:17 +00:00
parent 852fc4b91e
commit d8c7ef98c1
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

6
Makerules
View File

@ -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 $@

2
string/basename.c
View File

@ -23,5 +23,5 @@ char *
basename (const char *filename)
{
char *p = strrchr (filename, '/');
return p ? p + 1 : filename;
return p ? p + 1 : (char *) filename;
}