Remove duplicate ifunc tests.

35 files changed, 38 insertions, 645 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c59e33c38..e19ee278ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,42 @@
 2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
 
+	* string/Makefile: Remove ifunc tests.
+	* string/test-string.h: Define TEST_IFUNC.
+	* string/test-bcopy-ifunc.c: Remove.
+	* string/test-bzero-ifunc.c: Likewise.
+	* string/test-memccpy-ifunc.c: Likewise.
+	* string/test-memchr-ifunc.c: Likewise.
+	* string/test-memcmp-ifunc.c: Likewise.
+	* string/test-memcpy-ifunc.c: Likewise.
+	* string/test-memmem-ifunc.c: Likewise.
+	* string/test-memmove-ifunc.c: Likewise.
+	* string/test-mempcpy-ifunc.c: Likewise.
+	* string/test-memrchr-ifunc.c: Likewise.
+	* string/test-memset-ifunc.c: Likewise.
+	* string/test-rawmemchr-ifunc.c: Likewise.
+	* string/test-stpcpy-ifunc.c: Likewise.
+	* string/test-stpncpy-ifunc.c: Likewise.
+	* string/test-strcasecmp-ifunc.c: Likewise.
+	* string/test-strcasestr-ifunc.c: Likewise.
+	* string/test-strcat-ifunc.c: Likewise.
+	* string/test-strchr-ifunc.c: Likewise.
+	* string/test-strchrnul-ifunc.c: Likewise.
+	* string/test-strcmp-ifunc.c: Likewise.
+	* string/test-strcpy-ifunc.c: Likewise.
+	* string/test-strcspn-ifunc.c: Likewise.
+	* string/test-strlen-ifunc.c: Likewise.
+	* string/test-strncasecmp-ifunc.c: Likewise.
+	* string/test-strncat-ifunc.c: Likewise.
+	* string/test-strncmp-ifunc.c: Likewise.
+	* string/test-strncpy-ifunc.c: Likewise.
+	* string/test-strnlen-ifunc.c: Likewise.
+	* string/test-strpbrk-ifunc.c: Likewise.
+	* string/test-strrchr-ifunc.c: Likewise.
+	* string/test-strspn-ifunc.c: Likewise.
+	* string/test-strstr-ifunc.c: Likewise.
+
+2013-11-26  Ondřej Bílka  <neleai@seznam.cz>
+
 	* benchtests/Makefile: Remove ifunc tests.
 	* benchtests/bench-string.h: Define TEST_IFUNC.
 	* benchtests/bench-bcopy-ifunc.c: Remove.
diff --git a/string/Makefile b/string/Makefile
index c2c7d376ec..35135a03e7 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -54,9 +54,6 @@ tests		:= tester inl-tester noinl-tester testcopy test-ffs	\
 		   bug-envz1 tst-strxfrm2 tst-endian tst-svc2		\
 		   tst-strtok_r
 
-tests-ifunc := $(strop-tests:%=test-%-ifunc)
-tests += $(tests-ifunc)
-
 xtests = tst-strcoll-overflow
 
 include ../Rules
@@ -69,8 +66,6 @@ tst-strxfrm2-ENV = LOCPATH=$(common-objpfx)localedata
 bug-strcoll1-ENV = LOCPATH=$(common-objpfx)localedata
 test-strcasecmp-ENV = LOCPATH=$(common-objpfx)localedata
 test-strncasecmp-ENV = LOCPATH=$(common-objpfx)localedata
-test-strcasecmp-ifunc-ENV = LOCPATH=$(common-objpfx)localedata
-test-strncasecmp-ifunc-ENV = LOCPATH=$(common-objpfx)localedata
 CFLAGS-inl-tester.c = -fno-builtin
 CFLAGS-noinl-tester.c = -fno-builtin
 CFLAGS-tst-strlen.c = -fno-builtin
diff --git a/string/test-bcopy-ifunc.c b/string/test-bcopy-ifunc.c
deleted file mode 100644
index 9e136e3a31..0000000000
--- a/string/test-bcopy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of bcopy function.
-   Copyright (C) 2012-2013 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-bcopy.c"
diff --git a/string/test-bzero-ifunc.c b/string/test-bzero-ifunc.c
deleted file mode 100644
index 7c3ac2ea65..0000000000
--- a/string/test-bzero-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of bzero function.
-   Copyright (C) 2012-2013 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-bzero.c"
diff --git a/string/test-memccpy-ifunc.c b/string/test-memccpy-ifunc.c
deleted file mode 100644
index aa713abebd..0000000000
--- a/string/test-memccpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memccpy function.
-   Copyright (C) 2012-2013 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-memccpy.c"
diff --git a/string/test-memchr-ifunc.c b/string/test-memchr-ifunc.c
deleted file mode 100644
index a390a78b14..0000000000
--- a/string/test-memchr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memchr function.
-   Copyright (C) 2012-2013 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-memchr.c"
diff --git a/string/test-memcmp-ifunc.c b/string/test-memcmp-ifunc.c
deleted file mode 100644
index a333d75bac..0000000000
--- a/string/test-memcmp-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memcmp function.
-   Copyright (C) 2012-2013 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-memcmp.c"
diff --git a/string/test-memcpy-ifunc.c b/string/test-memcpy-ifunc.c
deleted file mode 100644
index e8bf929445..0000000000
--- a/string/test-memcpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memcpy function.
-   Copyright (C) 2012-2013 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-memcpy.c"
diff --git a/string/test-memmem-ifunc.c b/string/test-memmem-ifunc.c
deleted file mode 100644
index d6bca91d43..0000000000
--- a/string/test-memmem-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memmem function.
-   Copyright (C) 2012-2013 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-memmem.c"
diff --git a/string/test-memmove-ifunc.c b/string/test-memmove-ifunc.c
deleted file mode 100644
index 066f0749ea..0000000000
--- a/string/test-memmove-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memmove function.
-   Copyright (C) 2012-2013 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-memmove.c"
diff --git a/string/test-mempcpy-ifunc.c b/string/test-mempcpy-ifunc.c
deleted file mode 100644
index 3b24eb2041..0000000000
--- a/string/test-mempcpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of mempcpy function.
-   Copyright (C) 2012-2013 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-mempcpy.c"
diff --git a/string/test-memrchr-ifunc.c b/string/test-memrchr-ifunc.c
deleted file mode 100644
index 100dedbacc..0000000000
--- a/string/test-memrchr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memrchr function.
-   Copyright (C) 2013 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-memrchr.c"
diff --git a/string/test-memset-ifunc.c b/string/test-memset-ifunc.c
deleted file mode 100644
index 435cb77a58..0000000000
--- a/string/test-memset-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of memset function.
-   Copyright (C) 2012-2013 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-memset.c"
diff --git a/string/test-rawmemchr-ifunc.c b/string/test-rawmemchr-ifunc.c
deleted file mode 100644
index 890045237e..0000000000
--- a/string/test-rawmemchr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of rawmemchr function.
-   Copyright (C) 2012-2013 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-rawmemchr.c"
diff --git a/string/test-stpcpy-ifunc.c b/string/test-stpcpy-ifunc.c
deleted file mode 100644
index 0755a368e2..0000000000
--- a/string/test-stpcpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of stpcpy function.
-   Copyright (C) 2012-2013 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.c"
diff --git a/string/test-stpncpy-ifunc.c b/string/test-stpncpy-ifunc.c
deleted file mode 100644
index 43833fdcd3..0000000000
--- a/string/test-stpncpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of stpncpy function.
-   Copyright (C) 2012-2013 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-stpncpy.c"
diff --git a/string/test-strcasecmp-ifunc.c b/string/test-strcasecmp-ifunc.c
deleted file mode 100644
index 0cac4ed77c..0000000000
--- a/string/test-strcasecmp-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcasecmp function.
-   Copyright (C) 2012-2013 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-strcasecmp.c"
diff --git a/string/test-strcasestr-ifunc.c b/string/test-strcasestr-ifunc.c
deleted file mode 100644
index 77ec32999e..0000000000
--- a/string/test-strcasestr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcasestr function.
-   Copyright (C) 2012-2013 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-strcasestr.c"
diff --git a/string/test-strcat-ifunc.c b/string/test-strcat-ifunc.c
deleted file mode 100644
index d9fb5f2c77..0000000000
--- a/string/test-strcat-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcat function.
-   Copyright (C) 2012-2013 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-strcat.c"
diff --git a/string/test-strchr-ifunc.c b/string/test-strchr-ifunc.c
deleted file mode 100644
index 2f758a9902..0000000000
--- a/string/test-strchr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strchr function.
-   Copyright (C) 2012-2013 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-strchr.c"
diff --git a/string/test-strchrnul-ifunc.c b/string/test-strchrnul-ifunc.c
deleted file mode 100644
index 632a0341be..0000000000
--- a/string/test-strchrnul-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strchrnul function.
-   Copyright (C) 2012-2013 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-strchrnul.c"
diff --git a/string/test-strcmp-ifunc.c b/string/test-strcmp-ifunc.c
deleted file mode 100644
index f6a8c94084..0000000000
--- a/string/test-strcmp-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcmp function.
-   Copyright (C) 2012-2013 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-strcmp.c"
diff --git a/string/test-strcpy-ifunc.c b/string/test-strcpy-ifunc.c
deleted file mode 100644
index e4ec2059ea..0000000000
--- a/string/test-strcpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcpy function.
-   Copyright (C) 2012-2013 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.c"
diff --git a/string/test-strcspn-ifunc.c b/string/test-strcspn-ifunc.c
deleted file mode 100644
index 0dce0c411d..0000000000
--- a/string/test-strcspn-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strcspn function.
-   Copyright (C) 2012-2013 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-strcspn.c"
diff --git a/string/test-string.h b/string/test-string.h
index afb6980d59..5385fa04f5 100644
--- a/string/test-string.h
+++ b/string/test-string.h
@@ -18,6 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/cdefs.h>
+#define TEST_IFUNC
 
 typedef struct
 {
diff --git a/string/test-strlen-ifunc.c b/string/test-strlen-ifunc.c
deleted file mode 100644
index 8cf6755ec3..0000000000
--- a/string/test-strlen-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strlen function.
-   Copyright (C) 2012-2013 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-strlen.c"
diff --git a/string/test-strncasecmp-ifunc.c b/string/test-strncasecmp-ifunc.c
deleted file mode 100644
index bafcf0267d..0000000000
--- a/string/test-strncasecmp-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strncasecmp function.
-   Copyright (C) 2012-2013 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-strncasecmp.c"
diff --git a/string/test-strncat-ifunc.c b/string/test-strncat-ifunc.c
deleted file mode 100644
index d1e035492c..0000000000
--- a/string/test-strncat-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strncat function.
-   Copyright (C) 2012-2013 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-strncat.c"
diff --git a/string/test-strncmp-ifunc.c b/string/test-strncmp-ifunc.c
deleted file mode 100644
index c4a5b3b528..0000000000
--- a/string/test-strncmp-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strncmp function.
-   Copyright (C) 2012-2013 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-strncmp.c"
diff --git a/string/test-strncpy-ifunc.c b/string/test-strncpy-ifunc.c
deleted file mode 100644
index 04de132211..0000000000
--- a/string/test-strncpy-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strncpy function.
-   Copyright (C) 2012-2013 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-strncpy.c"
diff --git a/string/test-strnlen-ifunc.c b/string/test-strnlen-ifunc.c
deleted file mode 100644
index 5722b8f960..0000000000
--- a/string/test-strnlen-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strnlen function.
-   Copyright (C) 2012-2013 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-strnlen.c"
diff --git a/string/test-strpbrk-ifunc.c b/string/test-strpbrk-ifunc.c
deleted file mode 100644
index be6f03161d..0000000000
--- a/string/test-strpbrk-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strpbrk function.
-   Copyright (C) 2012-2013 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-strpbrk.c"
diff --git a/string/test-strrchr-ifunc.c b/string/test-strrchr-ifunc.c
deleted file mode 100644
index 83e2348c36..0000000000
--- a/string/test-strrchr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strrchr function.
-   Copyright (C) 2012-2013 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-strrchr.c"
diff --git a/string/test-strspn-ifunc.c b/string/test-strspn-ifunc.c
deleted file mode 100644
index ae9de07991..0000000000
--- a/string/test-strspn-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strspn function.
-   Copyright (C) 2012-2013 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-strspn.c"
diff --git a/string/test-strstr-ifunc.c b/string/test-strstr-ifunc.c
deleted file mode 100644
index 42e9c5e390..0000000000
--- a/string/test-strstr-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Test and measure IFUNC implementations of strstr function.
-   Copyright (C) 2012-2013 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-strstr.c"