mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 15:30:07 +00:00
1bdda52fe9
This patch moves the vDSO setup from libc to loader code, just after the vDSO link_map setup. For static case the initialization is moved to _dl_non_dynamic_init instead. Instead of using the mangled pointer, the vDSO data is set as attribute_relro (on _rtld_global_ro for shared or _dl_vdso_* for static). It is read-only even with partial relro. It fixes BZ#24967 now that the vDSO pointer is setup earlier than malloc interposition is called. Also, vDSO calls should not be a problem for static dlopen as indicated by BZ#20802. The vDSO pointer would be zero-initialized and the syscall will be issued instead. Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu, s390x-linux-gnu, sparc64-linux-gnu, and sparcv9-linux-gnu. I also run some tests on mips. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
86 lines
2.8 KiB
Makefile
86 lines
2.8 KiB
Makefile
ifeq ($(subdir),signal)
|
|
#sysdep_routines += sigsuspend
|
|
endif
|
|
|
|
ifeq ($(subdir),misc)
|
|
sysdep_routines += cachectl cacheflush sysmips _test_and_set
|
|
|
|
sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
|
|
endif
|
|
|
|
abi-variants := o32_soft o32_hard o32_soft_2008 o32_hard_2008
|
|
abi-variants += n32_soft n32_hard n32_soft_2008 n32_hard_2008
|
|
abi-variants += n64_soft n64_hard n64_soft_2008 n64_hard_2008
|
|
|
|
ifeq (,$(filter $(default-abi),$(abi-variants)))
|
|
Unknown ABI, must be one of $(abi-variants)
|
|
endif
|
|
|
|
abi-includes := sgidefs.h
|
|
|
|
# _MIPS_SIM_ABI32 == 1, _MIPS_SIM_NABI32 == 2, _MIPS_SIM_ABI64 == 3
|
|
abi-o32_soft-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI32)
|
|
abi-o32_hard-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI32)
|
|
abi-o32_soft_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI32)
|
|
abi-o32_hard_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI32)
|
|
abi-n32_soft-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_NABI32)
|
|
abi-n32_hard-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_NABI32)
|
|
abi-n32_soft_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_NABI32)
|
|
abi-n32_hard_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_NABI32)
|
|
abi-n64_soft-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI64)
|
|
abi-n64_hard-condition := !defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI64)
|
|
abi-n64_soft_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_soft_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI64)
|
|
abi-n64_hard_2008-condition := defined(__mips_nan2008) \
|
|
&& defined(__mips_hard_float) \
|
|
&& (_MIPS_SIM == _MIPS_SIM_ABI64)
|
|
|
|
ifeq ($(subdir),elf)
|
|
ifeq ($(build-shared),yes)
|
|
# This is needed for DSO loading from static binaries.
|
|
sysdep-dl-routines += dl-static
|
|
endif
|
|
# If the compiler doesn't use GNU.stack note,
|
|
# this test is expected to fail.
|
|
ifneq ($(mips-has-gnustack),yes)
|
|
test-xfail-check-execstack = yes
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(subdir),stdlib)
|
|
gen-as-const-headers += ucontext_i.sym
|
|
endif
|
|
|
|
ifeq ($(mips-force-execstack),yes)
|
|
CFLAGS-.o += -Wa,-execstack
|
|
CFLAGS-.os += -Wa,-execstack
|
|
CFLAGS-.op += -Wa,-execstack
|
|
CFLAGS-.oS += -Wa,-execstack
|
|
|
|
ASFLAGS-.o += -Wa,-execstack
|
|
ASFLAGS-.os += -Wa,-execstack
|
|
ASFLAGS-.op += -Wa,-execstack
|
|
ASFLAGS-.oS += -Wa,-execstack
|
|
endif
|