|
 |
ce426f |
Needed to get future uses of all-dl-routines to include
|
|
|
ce426f |
__get_cpu_features into the right shared object routines.
|
|
|
ce426f |
|
|
|
ce426f |
commit ac9e0e5e401fa634667a8284a0db0ca886bf816b
|
|
|
ce426f |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
ce426f |
Date: Fri Feb 6 10:42:08 2015 -0800
|
|
|
ce426f |
|
|
|
ce426f |
Clean up sysdep-dl-routines variable.
|
|
|
ce426f |
|
|
|
ce426f |
Index: glibc-2.17-c758a686/elf/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/elf/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/elf/Makefile
|
|
|
ce426f |
@@ -22,7 +22,7 @@ subdir := elf
|
|
|
ce426f |
include ../Makeconfig
|
|
|
ce426f |
|
|
|
ce426f |
headers = elf.h bits/elfclass.h link.h bits/link.h
|
|
|
ce426f |
-routines = $(dl-routines) dl-support dl-iteratephdr \
|
|
|
ce426f |
+routines = $(all-dl-routines) dl-support dl-iteratephdr \
|
|
|
ce426f |
dl-addr enbl-secure dl-profstub \
|
|
|
ce426f |
dl-origin dl-libc dl-sym dl-tsd dl-sysdep
|
|
|
ce426f |
|
|
|
ce426f |
@@ -43,7 +43,7 @@ shared-only-routines += dl-caller
|
|
|
ce426f |
|
|
|
ce426f |
# ld.so uses those routines, plus some special stuff for being the program
|
|
|
ce426f |
# interpreter and operating independent of libc.
|
|
|
ce426f |
-rtld-routines := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
|
|
|
ce426f |
+rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal
|
|
|
ce426f |
all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
|
|
|
ce426f |
|
|
|
ce426f |
CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/aarch64/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/aarch64/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/aarch64/Makefile
|
|
|
ce426f |
@@ -2,8 +2,6 @@ long-double-fcts = yes
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep_routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
gen-as-const-headers += dl-link.sym
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/arm/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/arm/Makefile
|
|
|
ce426f |
@@ -3,8 +3,8 @@ static-gnulib-arch = $(elfobjdir)/libgcc
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
|
|
|
ce426f |
+sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx
|
|
|
ce426f |
+sysdep-rtld-routines += aeabi_unwind_cpp_pr1
|
|
|
ce426f |
shared-only-routines += aeabi_unwind_cpp_pr1
|
|
|
ce426f |
|
|
|
ce426f |
$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/hppa/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/hppa/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/hppa/Makefile
|
|
|
ce426f |
@@ -24,8 +24,6 @@ LDFLAGS-c_pic.os += -Wl,--unique=.text*
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
CFLAGS-rtld.c += -mdisable-fpregs
|
|
|
ce426f |
sysdep-dl-routines += dl-symaddr dl-fptr
|
|
|
ce426f |
-sysdep_routines += $(sysdep-dl-routines)
|
|
|
ce426f |
-sysdep-rtld-routines += $(sysdep-dl-routines)
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),csu)
|
|
|
ce426f |
Index: glibc-2.17-c758a686/sysdeps/i386/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/sysdeps/i386/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/i386/Makefile
|
|
|
ce426f |
@@ -74,8 +74,6 @@ endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep_routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),csu)
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/ia64/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/ia64/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/ia64/Makefile
|
|
|
ce426f |
@@ -17,6 +17,4 @@ endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += dl-symaddr dl-fptr
|
|
|
ce426f |
-sysdep_routines += $(sysdep-dl-routines)
|
|
|
ce426f |
-sysdep-rtld-routines += $(sysdep-dl-routines)
|
|
|
ce426f |
endif
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/Makefile
|
|
|
ce426f |
@@ -14,8 +14,6 @@ endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += dl-static
|
|
|
ce426f |
-sysdep_routines += $(sysdep-dl-routines)
|
|
|
ce426f |
-sysdep-rtld-routines += $(sysdep-dl-routines)
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),rt)
|
|
|
ce426f |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/mips/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/Makefile
|
|
|
ce426f |
@@ -49,8 +49,6 @@ ifeq ($(subdir),elf)
|
|
|
ce426f |
ifeq ($(build-shared),yes)
|
|
|
ce426f |
# This is needed for DSO loading from static binaries.
|
|
|
ce426f |
sysdep-dl-routines += dl-static
|
|
|
ce426f |
-sysdep_routines += dl-static
|
|
|
ce426f |
-sysdep-rtld-routines += dl-static
|
|
|
ce426f |
endif
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/powerpc/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile
|
|
|
ce426f |
@@ -21,8 +21,6 @@ sysdep_routines += dl-vdso
|
|
|
ce426f |
ifeq ($(build-shared),yes)
|
|
|
ce426f |
# This is needed for DSO loading from static binaries.
|
|
|
ce426f |
sysdep-dl-routines += dl-static
|
|
|
ce426f |
-sysdep_routines += dl-static
|
|
|
ce426f |
-sysdep-rtld-routines += dl-static
|
|
|
ce426f |
endif
|
|
|
ce426f |
endif
|
|
|
ce426f |
|
|
|
ce426f |
Index: glibc-2.17-c758a686/sysdeps/x86_64/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/sysdeps/x86_64/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/x86_64/Makefile
|
|
|
ce426f |
@@ -20,8 +20,6 @@ endif
|
|
|
ce426f |
|
|
|
ce426f |
ifeq ($(subdir),elf)
|
|
|
ce426f |
sysdep-dl-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep_routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
-sysdep-rtld-routines += tlsdesc dl-tlsdesc
|
|
|
ce426f |
|
|
|
ce426f |
tests += tst-quad1 tst-quad2
|
|
|
ce426f |
modules-names += tst-quadmod1 tst-quadmod2
|