From bd5dadac87467eec9d6ffc3f1b11897ea052a636 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 26 Nov 2014 12:53:36 +0000 Subject: 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. --- debug/Makefile | 3 --- debug/test-stpcpy_chk-ifunc.c | 20 -------------------- debug/test-strcpy_chk-ifunc.c | 20 -------------------- 3 files changed, 43 deletions(-) delete mode 100644 debug/test-stpcpy_chk-ifunc.c delete mode 100644 debug/test-strcpy_chk-ifunc.c (limited to 'debug') diff --git a/debug/Makefile b/debug/Makefile index c284c51999..3ddcd1e1c3 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -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) diff --git a/debug/test-stpcpy_chk-ifunc.c b/debug/test-stpcpy_chk-ifunc.c deleted file mode 100644 index 91bd628599..0000000000 --- a/debug/test-stpcpy_chk-ifunc.c +++ /dev/null @@ -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 - . */ - -#define TEST_IFUNC 1 -#include "test-stpcpy_chk.c" diff --git a/debug/test-strcpy_chk-ifunc.c b/debug/test-strcpy_chk-ifunc.c deleted file mode 100644 index 8fe9fad8ae..0000000000 --- a/debug/test-strcpy_chk-ifunc.c +++ /dev/null @@ -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 - . */ - -#define TEST_IFUNC 1 -#include "test-strcpy_chk.c" -- cgit 1.4.1