This reverts commit
a1735e0aa858f0c8b15e5ee9975bff4279423680.
The test failure is a real valgrind bug that needs to be fixed before
valgrind is usable with a glibc that has been built with
CC="gcc -march=x86-64-v3". The proposed valgrind patch teaches
valgrind to replace ld.so strcmp with an unoptimized scalar
implementation, thus avoiding any AVX2-related problems.
Valgrind bug: <https://bugs.kde.org/show_bug.cgi?id=485487>
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
endif
$(objpfx)tst-valgrind-smoke.out: tst-valgrind-smoke.sh $(objpfx)ld.so $(objpfx)valgrind-test
$(SHELL) $< $(objpfx)ld.so $(rtlddir)/$(rtld-installed-name) '$(test-wrapper-env)' \
- '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-test \
- '$(valgrind-suppressions-tst-valgrind-smoke)' > $@; $(evaluate-test)
+ '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-test > $@; $(evaluate-test)
ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-rtld-does-not-exist.out
run_program_env="$4"
library_path="$5"
test_prog="$6"
-valgrind_suppressions="$7"
# Test whether valgrind is available in the test
# environment. If not, skip the test.
# Test valgrind works with the system ld.so in the test environment
/bin/sh -c \
"${test_wrapper_env} ${run_program_env} \
- valgrind -q --error-exitcode=1 ${valgrind_suppressions} \
+ valgrind -q --error-exitcode=1 \
${system_rtld} /bin/echo ${system_rtld}" || exit 77
# Finally the actual test inside the test environment,
# the smoke test under valgrind.
/bin/sh -c \
"${test_wrapper_env} ${run_program_env} \
- valgrind -q --error-exitcode=1 ${valgrind_suppressions} \
+ valgrind -q --error-exitcode=1 \
${rtld} --library-path ${library_path} ${test_prog} ${rtld}"
$(objpfx)tst-plt-rewrite2: $(objpfx)tst-plt-rewritemod2.so
endif
-# Check if ISA level is 3 or above.
-ifneq (,$(filter $(have-x86-isa-level),$(x86-isa-level-3-or-above)))
-valgrind-suppressions-tst-valgrind-smoke = \
- --suppressions=$(..)sysdeps/x86_64/tst-valgrind-smoke.supp
-endif
-
test-internal-extras += tst-gnu2-tls2mod1
-
endif # $(subdir) == elf
ifeq ($(subdir),csu)
+++ /dev/null
-{
- False positive at strcmp-avx2.S:462
- Memcheck:Cond
- fun:strcmp
- fun:_dl_name_match_p
- fun:_dl_map_object
- fun:map_doit
- fun:_dl_catch_exception
- fun:_dl_catch_error
- fun:do_preload
- fun:handle_preload_list
- fun:dl_main
- fun:_dl_sysdep_start
- fun:_dl_start_final
- fun:_dl_start
- obj:*/elf/ld.so
-}