mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
7b5f02dc2a
The arm string/tst-memmove-overflow XFAIL has been added in commiteca1b23332("arm: XFAIL string/tst-memmove-overflow due to bug 25620") as a way to reproduce the reported bug. Now that this bug has been fixed in commits79a4fa341b("arm: CVE-2020-6096: fix memcpy and memmove for negative length [BZ #25620]") andbeea361050("arm: CVE-2020-6096: Fix multiarch memcpy for negative length [BZ #25620]"), let's remove the XFAIL. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
71 lines
2.3 KiB
Makefile
71 lines
2.3 KiB
Makefile
gnulib-arch = $(elf-objpfx)libgcc-stubs.a
|
|
static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a
|
|
|
|
# All supported build tools support TLS descriptors, but the OS may not.
|
|
ifndef have-arm-tls-desc
|
|
have-arm-tls-desc = yes
|
|
endif
|
|
|
|
ifeq ($(subdir),elf)
|
|
sysdep-dl-routines += 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
|
|
$(build-extra-lib)
|
|
|
|
lib-noranlib: $(objpfx)libgcc-stubs.a
|
|
|
|
ifeq ($(build-shared),yes)
|
|
ifeq ($(have-arm-tls-desc),yes)
|
|
tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy
|
|
modules-names += tst-armtlsdesclocmod
|
|
modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod
|
|
CPPFLAGS-tst-armtlsdescextnowmod.c += -Dstatic=
|
|
CPPFLAGS-tst-armtlsdescextlazymod.c += -Dstatic=
|
|
CFLAGS-tst-armtlsdesclocmod.c += -mtls-dialect=gnu2
|
|
CFLAGS-tst-armtlsdescextnowmod.c += -mtls-dialect=gnu2
|
|
CFLAGS-tst-armtlsdescextlazymod.c += -mtls-dialect=gnu2
|
|
LDFLAGS-tst-armtlsdescextnowmod.so += -Wl,-z,now
|
|
tst-armtlsdescloc-ENV = LD_BIND_NOW=1
|
|
tst-armtlsdescextnow-ENV = LD_BIND_NOW=1
|
|
tst-armtlsdescextlazy-ENV = LD_BIND_NOW=1
|
|
$(objpfx)tst-armtlsdescloc: $(objpfx)tst-armtlsdesclocmod.so
|
|
$(objpfx)tst-armtlsdescextnow: $(objpfx)tst-armtlsdescextnowmod.so
|
|
$(objpfx)tst-armtlsdescextlazy: $(objpfx)tst-armtlsdescextlazymod.so
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(subdir),csu)
|
|
# get offset to rtld_global._dl_hwcap
|
|
gen-as-const-headers += rtld-global-offsets.sym tlsdesc.sym
|
|
aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math
|
|
aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \
|
|
aeabi_mb_cur_max aeabi_atexit aeabi_memclr aeabi_memcpy \
|
|
aeabi_memmove aeabi_memset \
|
|
aeabi_read_tp libc-aeabi_read_tp
|
|
|
|
sysdep_routines += $(aeabi_constants) $(aeabi_routines)
|
|
static-only-routines += $(aeabi_constants) aeabi_read_tp
|
|
shared-only-routines += libc-aeabi_read_tp
|
|
|
|
sysdep_routines += arm-unwind-resume
|
|
shared-only-routines += arm-unwind-resume
|
|
endif
|
|
|
|
ifeq ($(subdir),gmon)
|
|
sysdep_routines += arm-mcount
|
|
endif
|
|
|
|
ifeq ($(subdir),rt)
|
|
librt-sysdep_routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume
|
|
librt-shared-only-routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume
|
|
endif
|
|
|
|
ifeq ($(subdir),nptl)
|
|
libpthread-sysdep_routines += pt-arm-unwind-resume
|
|
libpthread-shared-only-routines += pt-arm-unwind-resume
|
|
endif
|