From: Siddhesh Poyarekar Date: Thu, 22 Jul 2021 13:07:41 +0000 (+0530) Subject: Make mcheck tests conditional on GLIBC_2.23 or earlier X-Git-Tag: glibc-2.34~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0075c4f39dcc53025103e2919aa74b02f776c1d2;p=thirdparty%2Fglibc.git Make mcheck tests conditional on GLIBC_2.23 or earlier Targets with base versions of 2.24 or later won't have __malloc_initialize_hook because of which the tests will essentially be the same as the regular malloc tests. Avoid running them instead and save time. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- diff --git a/malloc/Makefile b/malloc/Makefile index 918828e0504..063d103d970 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -78,6 +78,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ # Run all tests with MALLOC_CHECK_=3 tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) +# -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24. +ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) # Tests that don't play well with mcheck. They are either bugs in mcheck or # the tests expect specific internal behavior that is changed due to linking to # libmcheck.a. @@ -100,6 +102,7 @@ tests-exclude-mcheck = tst-mallocstate \ tst-reallocarray tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) +endif routines = malloc morecore mcheck mtrace obstack reallocarray \ scratch_buffer_dupfree \