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.
This commit is contained in:
Joseph Myers
parent
3b20fd5c0d
commit
bd5dadac87
20
ChangeLog
20
ChangeLog
|
|
@ -1,5 +1,25 @@
|
|||
2014-11-26 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* 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.
|
||||
|
||||
* string/test-strchr.c [!WIDE] (L): New macro.
|
||||
[WIDE] (L): Likewise.
|
||||
(check1): Use CHAR instead of char. Use L on string and character
|
||||
|
|
|
|||
4
Rules
4
Rules
|
|
@ -84,10 +84,6 @@ common-generated += dummy.o dummy.c
|
|||
# This makes all the auxiliary and test programs.
|
||||
|
||||
.PHONY: others tests bench
|
||||
ifeq ($(multi-arch),no)
|
||||
tests := $(filter-out $(tests-ifunc), $(tests))
|
||||
xtests := $(filter-out $(xtests-ifunc), $(xtests))
|
||||
endif
|
||||
|
||||
ifeq ($(build-programs),yes)
|
||||
others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
|
||||
|
|
|
|||
|
|
@ -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]));
|
||||
|
|
|
|||
|
|
@ -135,9 +135,6 @@ tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \
|
|||
tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 tst-backtrace4 \
|
||||
tst-backtrace5 tst-backtrace6
|
||||
|
||||
tests-ifunc := $(stpcpy_chk strcpy_chk:%=test-%-ifunc)
|
||||
tests += $(tests-ifunc)
|
||||
|
||||
extra-libs = libSegFault libpcprofile
|
||||
extra-libs-others = $(extra-libs)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of stpcpy checking function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-stpcpy_chk.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of strcpy checking function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-strcpy_chk.c"
|
||||
|
|
@ -18,7 +18,6 @@
|
|||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#define TEST_IFUNC
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
@ -105,7 +104,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;
|
||||
|
|
@ -164,7 +163,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]));
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ strop-tests := wcscmp wmemcmp wcslen wcschr wcsrchr wcscpy
|
|||
tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
|
||||
tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \
|
||||
tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests))
|
||||
tests-ifunc := $(strop-tests:%=test-%-ifunc)
|
||||
tests += $(tests-ifunc)
|
||||
|
||||
include ../Rules
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wcschr function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wcschr.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wcscmp function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wcscmp.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wcscpy function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wcscpy.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wcslen function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wcslen.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wcsrchr function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wcsrchr.c"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* Test and measure IFUNC implementations of wmemcmp function.
|
||||
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define TEST_IFUNC 1
|
||||
#include "test-wmemcmp.c"
|
||||
Loading…
Reference in New Issue