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

Fix remaining explicit uses of shlib.lds to use $(shlib-lds).

Browse Source
This commit is contained in:
Roland McGrath 2011-07-14 20:49:27 -07:00
parent 661607b3dd
commit a6928d5102
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-07-14 Roland McGrath <roland@hack.frob.com>
* Makefile ($(common-objpfx)linkobj/libc.so): Use $(shlib-lds) instead
of $(common-objpfx)shlib.lds.
* elf/Makefile ($(objpfx)sotruss-lib.so): Likewise.
* sysdeps/i386/i686/multiarch/strstr-c.c (libc_hidden_builtin_def):
Conditionalize redefinition on [SHARED && DO_VERSIONING && !NO_HIDDEN].

2
Makefile
View File

@ -143,7 +143,7 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
$(elfobjdir)/sofini.os \
$(elfobjdir)/interp.os \
$(elfobjdir)/ld.so \
$(common-objpfx)shlib.lds
$(shlib-lds)
$(build-shlib)
$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \

4
elf/Makefile
View File

@ -178,7 +178,7 @@ install-others += $(inst_auditdir)/sotruss-lib.so
install-bin-script += sotruss
generated += sotruss
CPPFLAGS-sotruss-lib = -DNOT_IN_libc
$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(common-objpfx)shlib.lds
$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os
$(build-module-asneeded)
$(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
$(common-objpfx)libc_nonshared.a
@ -355,6 +355,8 @@ endif
# Command to link into a larger single relocatable object.
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r
$(objpfx)sotruss-lib.so: $(shlib-lds)
$(objpfx)dl-allobjs.os: $(all-rtld-routines:%=$(objpfx)%.os)
$(reloc-link) -o $@ $^