diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-26 12:53:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-26 12:53:36 +0000 |
| commit | bd5dadac87467eec9d6ffc3f1b11897ea052a636 (patch) | |
| tree | 3b1433fef00896cd2c57d7404f08ebb163884254 /benchtests/bench-string.h | |
| parent | 3b20fd5c0df2621a38d128bb9d7ba145cdd4657c (diff) | |
| download | glibc-bd5dadac87467eec9d6ffc3f1b11897ea052a636.tar.gz glibc-bd5dadac87467eec9d6ffc3f1b11897ea052a636.tar.xz glibc-bd5dadac87467eec9d6ffc3f1b11897ea052a636.zip | |
Remove TEST_IFUNC, tests-ifunc and *-ifunc.c tests.
TEST_IFUNC is only tested in two headers, bench-string.h and test-string.h, after it gets defined by those headers, and it never gets undefined. Thus no defines of TEST_IFUNC are needed, and the *-ifunc.c tests that just define TEST_IFUNC and include other tests are also redundant, as is the code to remove $(tests-ifunc) and $(xtests-ifunc) conditionally from tests and xtests. This patch removes the useless defines and tests of TEST_IFUNC and the associated useless tests and makefile code. It thereby fixes a series of warnings "../string/test-string.h:21:0: warning: "TEST_IFUNC" redefined" where test-string.h defines TEST_IFUNC to empty, other files define it to 1 and this produces warnings. Tested for x86_64. * debug/test-stpcpy_chk-ifunc.c: Remove file. * debug/test-strcpy_chk-ifunc.c: Likewise. * wcsmbs/test-wcschr-ifunc.c: Likewise. * wcsmbs/test-wcscmp-ifunc.c: Likewise. * wcsmbs/test-wcscpy-ifunc.c: Likewise. * wcsmbs/test-wcslen-ifunc.c: Likewise. * wcsmbs/test-wcsrchr-ifunc.c: Likewise. * wcsmbs/test-wmemcmp-ifunc.c: Likewise. * Rules [$(multi-arch) = no] (tests): Do not filter out $(tests-ifunc). [$(multi-arch) = no] (xtests): Do not filter out $(xtests-ifunc). * debug/Makefile (tests-ifunc): Remove variable. (tests): Do not add $(tests-ifunc). * wcsmbs/Makefile (tests-ifunc): Remove variable. (tests): Do not add $(tests-ifunc). * benchtests/bench-string.h (TEST_IFUNC): Remove macro. [TEST_IFUNC]: Remove conditionals. * string/test-string.h (TEST_IFUNC): Remove macro. [TEST_IFUNC]: Remove conditionals.
Diffstat (limited to 'benchtests/bench-string.h')
| -rw-r--r-- | benchtests/bench-string.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/benchtests/bench-string.h b/benchtests/bench-string.h index bdb927f533..d0a247afe9 100644 --- a/benchtests/bench-string.h +++ b/benchtests/bench-string.h @@ -17,7 +17,6 @@ <http://www.gnu.org/licenses/>. */ #include <sys/cdefs.h> -#define TEST_IFUNC 1 typedef struct { @@ -107,7 +106,7 @@ size_t iterations = 100000; # define CALL(impl, ...) \ (* (proto_t) (impl)->fn) (__VA_ARGS__) -# if defined TEST_IFUNC && defined TEST_NAME +# ifdef TEST_NAME /* Increase size of FUNC_LIST if assert is triggered at run-time. */ static struct libc_ifunc_impl func_list[32]; static int func_count; @@ -153,11 +152,11 @@ static impl_t *impl_array; impl = impl_array; \ for (count = 0; count < impl_count; ++count, ++impl) \ if (!notall || impl->test) -# else /* ! (defined TEST_IFUNC && defined TEST_NAME) */ +# else /* !TEST_NAME */ # define FOR_EACH_IMPL(impl, notall) \ for (impl_t *impl = __start_impls; impl < __stop_impls; ++impl) \ if (!notall || impl->test) -# endif /* ! (defined TEST_IFUNC && defined TEST_NAME) */ +# endif /* !TEST_NAME */ # ifndef BUF1PAGES # define BUF1PAGES 1 @@ -166,7 +165,7 @@ static impl_t *impl_array; static void test_init (void) { -# if defined TEST_IFUNC && defined TEST_NAME +# ifdef TEST_NAME func_count = __libc_ifunc_impl_list (TEST_NAME, func_list, (sizeof func_list / sizeof func_list[0])); |