picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up sysdep-dl-routines variable.

This commit is contained in:
Roland McGrath 2015-02-06 10:42:08 -08:00
parent ebda2f17ff
commit ac9e0e5e40
14 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2015-02-06 Roland McGrath <roland@hack.frob.com>
* elf/Makefile (routines): Include $(all-dl-routines), not just
$(dl-routines).
(rtld-routines): Likewise. Use = rather than :=.
* sysdeps/aarch64/Makefile [$(subdir) = elf]
(sysdep_routines, sysdep-rtld-routines): Don't add tlsdesc and
dl-tlsdesc to these; sysdep-dl-routines alone is enough.
* sysdeps/arm/Makefile: Likewise.
* sysdeps/i386/Makefile: Likewise.
* sysdeps/x86_64/Makefile: Likewise.
* sysdeps/hppa/Makefile [$(subdir) = elf]
(sysdep_routines, sysdep-rtld-routines): Don't add
$(sysdep-dl-routines) to these.
* sysdeps/ia64/Makefile: Likewise.
* sysdeps/unix/sysv/linux/ia64/Makefile: Likewise.
* sysdeps/unix/sysv/linux/aarch64/Makefile [$(subdir) = elf]
[$(build-shared) = yes] (sysdep_routines, sysdep-rtld-routines):
Don't add dl-static to these; sysdep-dl-routines alone is enough.
* sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
* sysdeps/unix/sysv/linux/mips/Makefile: Likewise.
* sysdeps/unix/sysv/linux/powerpc/Makefile: Likewise.
* sysdeps/unix/sysv/linux/tile/Makefile: Likewise.
* sysdeps/powerpc/Makefile [$(subdir) = elf]
(sysdep_routines, sysdep-rtld-routines): Don't add dl-machine to
these; sysdep-dl-routines alone is enough.
2015-02-06 Joseph Myers <joseph@codesourcery.com>
[BZ #17932]

4
elf/Makefile
View File

@ -22,7 +22,7 @@ subdir := elf
include ../Makeconfig
headers = elf.h bits/elfclass.h link.h bits/link.h
routines = $(dl-routines) dl-support dl-iteratephdr \
routines = $(all-dl-routines) dl-support dl-iteratephdr \
dl-addr enbl-secure dl-profstub \
dl-origin dl-libc dl-sym dl-tsd dl-sysdep
@ -43,7 +43,7 @@ shared-only-routines += dl-caller
# ld.so uses those routines, plus some special stuff for being the program
# interpreter and operating independent of libc.
rtld-routines := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal
all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables

2
sysdeps/aarch64/Makefile
View File

@ -6,8 +6,6 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += tlsdesc dl-tlsdesc
sysdep_routines += tlsdesc dl-tlsdesc
sysdep-rtld-routines += tlsdesc dl-tlsdesc
gen-as-const-headers += dl-link.sym
endif

4
sysdeps/arm/Makefile
View File

@ -3,8 +3,8 @@ static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a
ifeq ($(subdir),elf)
sysdep-dl-routines += tlsdesc dl-tlsdesc
sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx
sysdep-rtld-routines += aeabi_unwind_cpp_pr1
shared-only-routines += aeabi_unwind_cpp_pr1
$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os

2
sysdeps/hppa/Makefile
View File

@ -26,8 +26,6 @@ CFLAGS-rtld.c += -mdisable-fpregs
sysdep-dl-routines += dl-symaddr dl-fptr
# dl-fptr.c needs a complete rewrite to fix ISO C aliasing violations.
CFLAGS-dl-fptr.c = -Wno-error
sysdep_routines += $(sysdep-dl-routines)
sysdep-rtld-routines += $(sysdep-dl-routines)
endif
ifeq ($(subdir),csu)

2
sysdeps/i386/Makefile
View File

@ -66,8 +66,6 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += tlsdesc dl-tlsdesc
sysdep_routines += tlsdesc dl-tlsdesc
sysdep-rtld-routines += tlsdesc dl-tlsdesc
endif
ifeq ($(subdir),csu)

2
sysdeps/ia64/Makefile
View File

@ -17,6 +17,4 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-symaddr dl-fptr
sysdep_routines += $(sysdep-dl-routines)
sysdep-rtld-routines += $(sysdep-dl-routines)
endif

2
sysdeps/unix/sysv/linux/aarch64/Makefile
View File

@ -10,8 +10,6 @@ sysdep-rtld-routines += __read_tp
ifeq ($(build-shared),yes)
# This is needed for DSO loading from static binaries.
sysdep-dl-routines += dl-static
sysdep_routines += dl-static
sysdep-rtld-routines += dl-static
endif
endif

2
sysdeps/unix/sysv/linux/ia64/Makefile
View File

@ -15,8 +15,6 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-static
sysdep_routines += $(sysdep-dl-routines)
sysdep-rtld-routines += $(sysdep-dl-routines)
endif
ifeq ($(subdir),rt)

4
sysdeps/unix/sysv/linux/m68k/Makefile
View File

@ -13,8 +13,8 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += dl-static
sysdep_routines += dl-vdso libc-m68k-vdso dl-static
sysdep-rtld-routines += m68k-vdso dl-static
sysdep_routines += dl-vdso libc-m68k-vdso
sysdep-rtld-routines += m68k-vdso
sysdep-others += lddlibc4
install-bin += lddlibc4
endif

2
sysdeps/unix/sysv/linux/mips/Makefile
View File

@ -96,8 +96,6 @@ ifeq ($(subdir),elf)
ifeq ($(build-shared),yes)
# This is needed for DSO loading from static binaries.
sysdep-dl-routines += dl-static
sysdep_routines += dl-static
sysdep-rtld-routines += dl-static
endif
endif

2
sysdeps/unix/sysv/linux/powerpc/Makefile
View File

@ -19,8 +19,6 @@ sysdep_routines += dl-vdso
ifeq ($(build-shared),yes)
# This is needed for DSO loading from static binaries.
sysdep-dl-routines += dl-static
sysdep_routines += dl-static
sysdep-rtld-routines += dl-static
endif
endif

2
sysdeps/unix/sysv/linux/tile/Makefile
View File

@ -19,8 +19,6 @@ sysdep_routines += dl-vdso
ifeq ($(build-shared),yes)
# This is needed for DSO loading from static binaries.
sysdep-dl-routines += dl-static
sysdep_routines += dl-static
sysdep-rtld-routines += dl-static
endif
endif

2
sysdeps/x86_64/Makefile
View File

@ -20,8 +20,6 @@ endif
ifeq ($(subdir),elf)
sysdep-dl-routines += tlsdesc dl-tlsdesc
sysdep_routines += tlsdesc dl-tlsdesc
sysdep-rtld-routines += tlsdesc dl-tlsdesc
tests += tst-quad1 tst-quad2
modules-names += tst-quadmod1 tst-quadmod2