summaryrefslogtreecommitdiff
path: root/libc/string
diff options
context:
space:
mode:
Diffstat (limited to 'libc/string')
-rw-r--r--libc/string/Makefile7
-rw-r--r--libc/string/_strerror.c2
-rw-r--r--libc/string/argz-addsep.c2
-rw-r--r--libc/string/argz-append.c2
-rw-r--r--libc/string/argz-count.c2
-rw-r--r--libc/string/argz-create.c2
-rw-r--r--libc/string/argz-ctsep.c2
-rw-r--r--libc/string/argz-delete.c2
-rw-r--r--libc/string/argz-extract.c2
-rw-r--r--libc/string/argz-insert.c2
-rw-r--r--libc/string/argz-next.c2
-rw-r--r--libc/string/argz-replace.c2
-rw-r--r--libc/string/argz-stringify.c2
-rw-r--r--libc/string/argz.h2
-rw-r--r--libc/string/basename.c2
-rw-r--r--libc/string/bcopy.c2
-rw-r--r--libc/string/bits/string2.h2
-rw-r--r--libc/string/bits/string3.h2
-rw-r--r--libc/string/byteswap.h2
-rw-r--r--libc/string/bzero.c2
-rw-r--r--libc/string/endian.h2
-rw-r--r--libc/string/envz.c2
-rw-r--r--libc/string/envz.h2
-rw-r--r--libc/string/ffs.c2
-rw-r--r--libc/string/ffsll.c2
-rw-r--r--libc/string/memccpy.c2
-rw-r--r--libc/string/memchr.c8
-rw-r--r--libc/string/memcmp.c8
-rw-r--r--libc/string/memcpy.c2
-rw-r--r--libc/string/memfrob.c2
-rw-r--r--libc/string/memmem.c2
-rw-r--r--libc/string/memmove.c2
-rw-r--r--libc/string/memory.h2
-rw-r--r--libc/string/mempcpy.c8
-rw-r--r--libc/string/memrchr.c2
-rw-r--r--libc/string/memset.c2
-rw-r--r--libc/string/rawmemchr.c7
-rw-r--r--libc/string/stpcpy.c2
-rw-r--r--libc/string/stpncpy.c2
-rw-r--r--libc/string/str-two-way.h2
-rw-r--r--libc/string/stratcliff.c2
-rw-r--r--libc/string/strcasecmp.c2
-rw-r--r--libc/string/strcasecmp_l.c2
-rw-r--r--libc/string/strcasestr.c2
-rw-r--r--libc/string/strcat.c2
-rw-r--r--libc/string/strchr.c2
-rw-r--r--libc/string/strchrnul.c8
-rw-r--r--libc/string/strcmp.c2
-rw-r--r--libc/string/strcoll.c2
-rw-r--r--libc/string/strcoll_l.c3
-rw-r--r--libc/string/strcpy.c2
-rw-r--r--libc/string/strcspn.c2
-rw-r--r--libc/string/strdup.c2
-rw-r--r--libc/string/strerror.c2
-rw-r--r--libc/string/strerror_l.c2
-rw-r--r--libc/string/strfry.c2
-rw-r--r--libc/string/string-inlines.c2
-rw-r--r--libc/string/string.h10
-rw-r--r--libc/string/strings.h10
-rw-r--r--libc/string/strlen.c2
-rw-r--r--libc/string/strncase.c2
-rw-r--r--libc/string/strncase_l.c2
-rw-r--r--libc/string/strncat.c2
-rw-r--r--libc/string/strncmp.c2
-rw-r--r--libc/string/strncpy.c2
-rw-r--r--libc/string/strndup.c2
-rw-r--r--libc/string/strnlen.c2
-rw-r--r--libc/string/strpbrk.c2
-rw-r--r--libc/string/strrchr.c2
-rw-r--r--libc/string/strsep.c2
-rw-r--r--libc/string/strsignal.c2
-rw-r--r--libc/string/strspn.c2
-rw-r--r--libc/string/strstr.c2
-rw-r--r--libc/string/strtok.c2
-rw-r--r--libc/string/strtok_r.c2
-rw-r--r--libc/string/strverscmp.c2
-rw-r--r--libc/string/strxfrm.c2
-rw-r--r--libc/string/strxfrm_l.c2
-rw-r--r--libc/string/swab.c2
-rw-r--r--libc/string/test-bcopy-ifunc.c20
-rw-r--r--libc/string/test-bcopy.c2
-rw-r--r--libc/string/test-bzero-ifunc.c20
-rw-r--r--libc/string/test-bzero.c2
-rw-r--r--libc/string/test-ffs.c2
-rw-r--r--libc/string/test-memccpy-ifunc.c20
-rw-r--r--libc/string/test-memccpy.c2
-rw-r--r--libc/string/test-memchr-ifunc.c20
-rw-r--r--libc/string/test-memchr.c2
-rw-r--r--libc/string/test-memcmp-ifunc.c20
-rw-r--r--libc/string/test-memcmp.c2
-rw-r--r--libc/string/test-memcpy-ifunc.c20
-rw-r--r--libc/string/test-memcpy.c2
-rw-r--r--libc/string/test-memmem-ifunc.c20
-rw-r--r--libc/string/test-memmem.c2
-rw-r--r--libc/string/test-memmove-ifunc.c20
-rw-r--r--libc/string/test-memmove.c2
-rw-r--r--libc/string/test-mempcpy-ifunc.c20
-rw-r--r--libc/string/test-mempcpy.c2
-rw-r--r--libc/string/test-memrchr-ifunc.c20
-rw-r--r--libc/string/test-memrchr.c2
-rw-r--r--libc/string/test-memset-ifunc.c20
-rw-r--r--libc/string/test-memset.c2
-rw-r--r--libc/string/test-rawmemchr-ifunc.c20
-rw-r--r--libc/string/test-rawmemchr.c2
-rw-r--r--libc/string/test-stpcpy-ifunc.c20
-rw-r--r--libc/string/test-stpcpy.c2
-rw-r--r--libc/string/test-stpncpy-ifunc.c20
-rw-r--r--libc/string/test-stpncpy.c2
-rw-r--r--libc/string/test-strcasecmp-ifunc.c20
-rw-r--r--libc/string/test-strcasecmp.c2
-rw-r--r--libc/string/test-strcasestr-ifunc.c20
-rw-r--r--libc/string/test-strcasestr.c2
-rw-r--r--libc/string/test-strcat-ifunc.c20
-rw-r--r--libc/string/test-strcat.c2
-rw-r--r--libc/string/test-strchr-ifunc.c20
-rw-r--r--libc/string/test-strchr.c2
-rw-r--r--libc/string/test-strchrnul-ifunc.c20
-rw-r--r--libc/string/test-strchrnul.c2
-rw-r--r--libc/string/test-strcmp-ifunc.c20
-rw-r--r--libc/string/test-strcmp.c2
-rw-r--r--libc/string/test-strcpy-ifunc.c20
-rw-r--r--libc/string/test-strcpy.c2
-rw-r--r--libc/string/test-strcspn-ifunc.c20
-rw-r--r--libc/string/test-strcspn.c2
-rw-r--r--libc/string/test-string.h3
-rw-r--r--libc/string/test-strlen-ifunc.c20
-rw-r--r--libc/string/test-strlen.c2
-rw-r--r--libc/string/test-strncasecmp-ifunc.c20
-rw-r--r--libc/string/test-strncasecmp.c2
-rw-r--r--libc/string/test-strncat-ifunc.c20
-rw-r--r--libc/string/test-strncat.c2
-rw-r--r--libc/string/test-strncmp-ifunc.c20
-rw-r--r--libc/string/test-strncmp.c2
-rw-r--r--libc/string/test-strncpy-ifunc.c20
-rw-r--r--libc/string/test-strncpy.c2
-rw-r--r--libc/string/test-strnlen-ifunc.c20
-rw-r--r--libc/string/test-strnlen.c2
-rw-r--r--libc/string/test-strpbrk-ifunc.c20
-rw-r--r--libc/string/test-strpbrk.c2
-rw-r--r--libc/string/test-strrchr-ifunc.c20
-rw-r--r--libc/string/test-strrchr.c2
-rw-r--r--libc/string/test-strspn-ifunc.c20
-rw-r--r--libc/string/test-strspn.c2
-rw-r--r--libc/string/test-strstr-ifunc.c20
-rw-r--r--libc/string/test-strstr.c2
-rw-r--r--libc/string/testcopy.c2
-rw-r--r--libc/string/tester.c2
-rw-r--r--libc/string/tst-bswap.c2
-rw-r--r--libc/string/tst-inlcall.c2
-rw-r--r--libc/string/tst-strcoll-overflow.c2
-rw-r--r--libc/string/tst-strtok_r.c2
-rw-r--r--libc/string/wordcopy.c38
-rw-r--r--libc/string/xpg-strerror.c2
153 files changed, 179 insertions, 791 deletions
diff --git a/libc/string/Makefile b/libc/string/Makefile
index 3bebc75ea..0a30cb573 100644
--- a/libc/string/Makefile
+++ b/libc/string/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2013 Free Software Foundation, Inc.
+# Copyright (C) 1991-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
@@ -60,9 +60,6 @@ tests-$(OPTION_EGLIBC_ENVZ) += bug-envz1
tests-$(OPTION_EGLIBC_LOCALE_CODE) \
+= tst-strxfrm bug-strcoll1
-tests-ifunc := $(strop-tests:%=test-%-ifunc)
-tests += $(tests-ifunc)
-
xtests = tst-strcoll-overflow
include ../Rules
@@ -75,8 +72,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/libc/string/_strerror.c b/libc/string/_strerror.c
index e0be266f7..d171044cb 100644
--- a/libc/string/_strerror.c
+++ b/libc/string/_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/argz-addsep.c b/libc/string/argz-addsep.c
index 12381f4f6..90478b070 100644
--- a/libc/string/argz-addsep.c
+++ b/libc/string/argz-addsep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
diff --git a/libc/string/argz-append.c b/libc/string/argz-append.c
index 84c2568b9..5efa37959 100644
--- a/libc/string/argz-append.c
+++ b/libc/string/argz-append.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
diff --git a/libc/string/argz-count.c b/libc/string/argz-count.c
index 7d87236dc..d33d4f6ea 100644
--- a/libc/string/argz-count.c
+++ b/libc/string/argz-count.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
diff --git a/libc/string/argz-create.c b/libc/string/argz-create.c
index 6fd1e7e6c..ae971dee1 100644
--- a/libc/string/argz-create.c
+++ b/libc/string/argz-create.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
diff --git a/libc/string/argz-ctsep.c b/libc/string/argz-ctsep.c
index 1999cdec6..0a2f58c4d 100644
--- a/libc/string/argz-ctsep.c
+++ b/libc/string/argz-ctsep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
diff --git a/libc/string/argz-delete.c b/libc/string/argz-delete.c
index ad26bc72f..398c7a663 100644
--- a/libc/string/argz-delete.c
+++ b/libc/string/argz-delete.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
diff --git a/libc/string/argz-extract.c b/libc/string/argz-extract.c
index 7b76df909..795a4325a 100644
--- a/libc/string/argz-extract.c
+++ b/libc/string/argz-extract.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
diff --git a/libc/string/argz-insert.c b/libc/string/argz-insert.c
index e2d1b9049..f95948ff8 100644
--- a/libc/string/argz-insert.c
+++ b/libc/string/argz-insert.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
diff --git a/libc/string/argz-next.c b/libc/string/argz-next.c
index 01166be80..0be19f201 100644
--- a/libc/string/argz-next.c
+++ b/libc/string/argz-next.c
@@ -1,5 +1,5 @@
/* Iterate through the elements of an argz block.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
diff --git a/libc/string/argz-replace.c b/libc/string/argz-replace.c
index 4fd0f0fe1..e07f8a6a6 100644
--- a/libc/string/argz-replace.c
+++ b/libc/string/argz-replace.c
@@ -1,5 +1,5 @@
/* String replacement in an argz vector
- Copyright (C) 1997-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
diff --git a/libc/string/argz-stringify.c b/libc/string/argz-stringify.c
index f18924835..43a6d5f52 100644
--- a/libc/string/argz-stringify.c
+++ b/libc/string/argz-stringify.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
diff --git a/libc/string/argz.h b/libc/string/argz.h
index 4a9edadcc..f43271fa0 100644
--- a/libc/string/argz.h
+++ b/libc/string/argz.h
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-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
diff --git a/libc/string/basename.c b/libc/string/basename.c
index 8b8a4c3ae..29b84eecb 100644
--- a/libc/string/basename.c
+++ b/libc/string/basename.c
@@ -1,5 +1,5 @@
/* Return the name-within-directory of a file name.
- Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ Copyright (C) 1996-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
diff --git a/libc/string/bcopy.c b/libc/string/bcopy.c
index 73eaf4efc..7c1225c4d 100644
--- a/libc/string/bcopy.c
+++ b/libc/string/bcopy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/bits/string2.h b/libc/string/bits/string2.h
index 9369a7c4d..b3df7089a 100644
--- a/libc/string/bits/string2.h
+++ b/libc/string/bits/string2.h
@@ -1,5 +1,5 @@
/* Machine-independant string function optimizations.
- Copyright (C) 1997-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
diff --git a/libc/string/bits/string3.h b/libc/string/bits/string3.h
index 233aa9e0a..acd257740 100644
--- a/libc/string/bits/string3.h
+++ b/libc/string/bits/string3.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2004-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
diff --git a/libc/string/byteswap.h b/libc/string/byteswap.h
index 705015f05..cd76b449b 100644
--- a/libc/string/byteswap.h
+++ b/libc/string/byteswap.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-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
diff --git a/libc/string/bzero.c b/libc/string/bzero.c
index 6d5a0a859..9c220b9c1 100644
--- a/libc/string/bzero.c
+++ b/libc/string/bzero.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/endian.h b/libc/string/endian.h
index f414cb150..875fea377 100644
--- a/libc/string/endian.h
+++ b/libc/string/endian.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/envz.c b/libc/string/envz.c
index ee5788234..8a79484f3 100644
--- a/libc/string/envz.c
+++ b/libc/string/envz.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated environment vectors
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
diff --git a/libc/string/envz.h b/libc/string/envz.h
index f3bfaa0de..f51931cee 100644
--- a/libc/string/envz.h
+++ b/libc/string/envz.h
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated environment vectors
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-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
diff --git a/libc/string/ffs.c b/libc/string/ffs.c
index 916c5c348..392d5044c 100644
--- a/libc/string/ffs.c
+++ b/libc/string/ffs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/ffsll.c b/libc/string/ffsll.c
index c50cd0f70..5b54b33c2 100644
--- a/libc/string/ffsll.c
+++ b/libc/string/ffsll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/memccpy.c b/libc/string/memccpy.c
index 2a3303221..793f68ee1 100644
--- a/libc/string/memccpy.c
+++ b/libc/string/memccpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/memchr.c b/libc/string/memchr.c
index 2427c4b4b..7408f33b2 100644
--- a/libc/string/memchr.c
+++ b/libc/string/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@@ -51,9 +51,13 @@
#undef memchr
#undef __memchr
+#ifndef MEMCHR
+# define MEMCHR __memchr
+#endif
+
/* Search no more than N bytes of S for C. */
__ptr_t
-__memchr (s, c_in, n)
+MEMCHR (s, c_in, n)
const __ptr_t s;
int c_in;
size_t n;
diff --git a/libc/string/memcmp.c b/libc/string/memcmp.c
index dd76145f0..ce9e897e2 100644
--- a/libc/string/memcmp.c
+++ b/libc/string/memcmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@@ -29,6 +29,10 @@
#undef memcmp
+#ifndef MEMCMP
+# define MEMCMP memcmp
+#endif
+
#ifdef _LIBC
# include <memcopy.h>
@@ -304,7 +308,7 @@ memcmp_not_common_alignment (srcp1, srcp2, len)
}
int
-memcmp (s1, s2, len)
+MEMCMP (s1, s2, len)
const __ptr_t s1;
const __ptr_t s2;
size_t len;
diff --git a/libc/string/memcpy.c b/libc/string/memcpy.c
index 3be8e3557..c19bad3b6 100644
--- a/libc/string/memcpy.c
+++ b/libc/string/memcpy.c
@@ -1,6 +1,6 @@
/* Copy memory to memory until the specified number of bytes
has been copied. Overlap is NOT handled correctly.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/memfrob.c b/libc/string/memfrob.c
index f0897eb23..484130987 100644
--- a/libc/string/memfrob.c
+++ b/libc/string/memfrob.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/memmem.c b/libc/string/memmem.c
index 1ff644282..93e5e18c6 100644
--- a/libc/string/memmem.c
+++ b/libc/string/memmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/memmove.c b/libc/string/memmove.c
index ec61e28c6..337340172 100644
--- a/libc/string/memmove.c
+++ b/libc/string/memmove.c
@@ -1,6 +1,6 @@
/* Copy memory to memory until the specified number of bytes
has been copied. Overlap is handled correctly.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/memory.h b/libc/string/memory.h
index b58932bf3..6d3c3d506 100644
--- a/libc/string/memory.h
+++ b/libc/string/memory.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/mempcpy.c b/libc/string/mempcpy.c
index c0d244820..9749863ea 100644
--- a/libc/string/mempcpy.c
+++ b/libc/string/mempcpy.c
@@ -1,7 +1,7 @@
/* Copy memory to memory until the specified number of bytes
has been copied, return pointer to following byte.
Overlap is NOT handled correctly.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@@ -24,8 +24,12 @@
#undef mempcpy
#undef __mempcpy
+#ifndef MEMPCPY
+# define MEMPCPY __mempcpy
+#endif
+
void *
-__mempcpy (void *dest, const void *src, size_t len)
+MEMPCPY (void *dest, const void *src, size_t len)
{
return memcpy (dest, src, len) + len;
}
diff --git a/libc/string/memrchr.c b/libc/string/memrchr.c
index 9f504f112..a0bde9278 100644
--- a/libc/string/memrchr.c
+++ b/libc/string/memrchr.c
@@ -1,5 +1,5 @@
/* memrchr -- find the last occurrence of a byte in a memory block
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
diff --git a/libc/string/memset.c b/libc/string/memset.c
index 74b540921..275ff4233 100644
--- a/libc/string/memset.c
+++ b/libc/string/memset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/rawmemchr.c b/libc/string/rawmemchr.c
index 30fbe8761..110a6bc45 100644
--- a/libc/string/rawmemchr.c
+++ b/libc/string/rawmemchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@@ -47,10 +47,13 @@
#undef memchr
+#ifndef RAWMEMCHR
+# define RAWMEMCHR __rawmemchr
+#endif
/* Find the first occurrence of C in S. */
__ptr_t
-__rawmemchr (s, c_in)
+RAWMEMCHR (s, c_in)
const __ptr_t s;
int c_in;
{
diff --git a/libc/string/stpcpy.c b/libc/string/stpcpy.c
index 8ece3d9a7..fc5ae5534 100644
--- a/libc/string/stpcpy.c
+++ b/libc/string/stpcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/stpncpy.c b/libc/string/stpncpy.c
index 629ad2ecc..fad747e7a 100644
--- a/libc/string/stpncpy.c
+++ b/libc/string/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
diff --git a/libc/string/str-two-way.h b/libc/string/str-two-way.h
index 1cc20ee47..f15b9d368 100644
--- a/libc/string/str-two-way.h
+++ b/libc/string/str-two-way.h
@@ -1,5 +1,5 @@
/* Byte-wise substring search, using the Two-Way algorithm.
- Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ Copyright (C) 2008-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Eric Blake <ebb9@byu.net>, 2008.
diff --git a/libc/string/stratcliff.c b/libc/string/stratcliff.c
index 385008574..596c61ef8 100644
--- a/libc/string/stratcliff.c
+++ b/libc/string/stratcliff.c
@@ -1,5 +1,5 @@
/* Test for string function add boundaries of usable memory.
- Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ Copyright (C) 1996-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c
index f2f48732c..510caa2ab 100644
--- a/libc/string/strcasecmp.c
+++ b/libc/string/strcasecmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strcasecmp_l.c b/libc/string/strcasecmp_l.c
index 7b81bafcb..25c419e33 100644
--- a/libc/string/strcasecmp_l.c
+++ b/libc/string/strcasecmp_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-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
diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c
index 7c8cbcc4c..4bd6d415f 100644
--- a/libc/string/strcasestr.c
+++ b/libc/string/strcasestr.c
@@ -1,5 +1,5 @@
/* Return the offset of one string within another.
- Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ Copyright (C) 1994-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
diff --git a/libc/string/strcat.c b/libc/string/strcat.c
index 5f5bf9cb8..bb7c0a990 100644
--- a/libc/string/strcat.c
+++ b/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strchr.c b/libc/string/strchr.c
index 731290027..da69ed235 100644
--- a/libc/string/strchr.c
+++ b/libc/string/strchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
diff --git a/libc/string/strchrnul.c b/libc/string/strchrnul.c
index 1f63572d6..2aec3144e 100644
--- a/libc/string/strchrnul.c
+++ b/libc/string/strchrnul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and
@@ -27,9 +27,13 @@
#undef __strchrnul
#undef strchrnul
+#ifndef STRCHRNUL
+# define STRCHRNUL __strchrnul
+#endif
+
/* Find the first occurrence of C in S or the final NUL byte. */
char *
-__strchrnul (s, c_in)
+STRCHRNUL (s, c_in)
const char *s;
int c_in;
{
diff --git a/libc/string/strcmp.c b/libc/string/strcmp.c
index a4645638e..212f20cc1 100644
--- a/libc/string/strcmp.c
+++ b/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strcoll.c b/libc/string/strcoll.c
index 9fe53ff05..779ba1309 100644
--- a/libc/string/strcoll.c
+++ b/libc/string/strcoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
diff --git a/libc/string/strcoll_l.c b/libc/string/strcoll_l.c
index b85c1c5e2..3cb9ab00f 100644
--- a/libc/string/strcoll_l.c
+++ b/libc/string/strcoll_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
@@ -24,6 +24,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/param.h>
#include <gnu/option-groups.h>
#ifndef STRING_TYPE
diff --git a/libc/string/strcpy.c b/libc/string/strcpy.c
index b71f7536b..f13691643 100644
--- a/libc/string/strcpy.c
+++ b/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strcspn.c b/libc/string/strcspn.c
index 908d329ce..7c39f793e 100644
--- a/libc/string/strcspn.c
+++ b/libc/string/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strdup.c b/libc/string/strdup.c
index 1dacf787c..cedffa0da 100644
--- a/libc/string/strdup.c
+++ b/libc/string/strdup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strerror.c b/libc/string/strerror.c
index 9123c396b..5eed633e2 100644
--- a/libc/string/strerror.c
+++ b/libc/string/strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strerror_l.c b/libc/string/strerror_l.c
index 50228d66e..9a7bd7188 100644
--- a/libc/string/strerror_l.c
+++ b/libc/string/strerror_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2007-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
diff --git a/libc/string/strfry.c b/libc/string/strfry.c
index f40c532c8..e448947d9 100644
--- a/libc/string/strfry.c
+++ b/libc/string/strfry.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/string-inlines.c b/libc/string/string-inlines.c
index d85f4d3ae..1e1e91ab4 100644
--- a/libc/string/string-inlines.c
+++ b/libc/string/string-inlines.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1999-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
diff --git a/libc/string/string.h b/libc/string/string.h
index ecc3fef1b..b127e8d9d 100644
--- a/libc/string/string.h
+++ b/libc/string/string.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
@@ -31,8 +31,12 @@ __BEGIN_DECLS
#define __need_NULL
#include <stddef.h>
-/* Tell the caller that we provide correct C++ prototypes. */
-#if defined __cplusplus && __GNUC_PREREQ (4, 4)
+/* Provide correct C++ prototypes, and indicate this to the caller. This
+ requires a compatible C++ standard library. As a heuristic, we provide
+ these when the compiler indicates full conformance with C++98 or later,
+ and for older GCC versions that are known to provide a compatible
+ libstdc++. */
+#if defined __cplusplus && (__cplusplus >= 199711L || __GNUC_PREREQ (4, 4))
# define __CORRECT_ISO_CPP_STRING_H_PROTO
#endif
diff --git a/libc/string/strings.h b/libc/string/strings.h
index dad0a0446..994c4b048 100644
--- a/libc/string/strings.h
+++ b/libc/string/strings.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
@@ -27,8 +27,12 @@
# define __need_size_t
# include <stddef.h>
-/* Tell the caller that we provide correct C++ prototypes. */
-# if defined __cplusplus && __GNUC_PREREQ (4, 4)
+/* Provide correct C++ prototypes, and indicate this to the caller. This
+ requires a compatible C++ standard library. As a heuristic, we provide
+ these when the compiler indicates full conformance with C++98 or later,
+ and for older GCC versions that are known to provide a compatible
+ libstdc++. */
+# if defined __cplusplus && (__cplusplus >= 199711L || __GNUC_PREREQ (4, 4))
# define __CORRECT_ISO_CPP_STRINGS_H_PROTO
# endif
diff --git a/libc/string/strlen.c b/libc/string/strlen.c
index eba5f11ef..342c4a2b7 100644
--- a/libc/string/strlen.c
+++ b/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se);
diff --git a/libc/string/strncase.c b/libc/string/strncase.c
index 105286a81..a462a2a0e 100644
--- a/libc/string/strncase.c
+++ b/libc/string/strncase.c
@@ -1,6 +1,6 @@
/* Compare at most N characters of two strings without taking care for
the case.
- Copyright (C) 1992-2013 Free Software Foundation, Inc.
+ Copyright (C) 1992-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
diff --git a/libc/string/strncase_l.c b/libc/string/strncase_l.c
index 300fa7bcc..01e1f0c7c 100644
--- a/libc/string/strncase_l.c
+++ b/libc/string/strncase_l.c
@@ -1,6 +1,6 @@
/* Compare at most N characters of two strings without taking care for
the case using given locale.
- Copyright (C) 1997-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-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
diff --git a/libc/string/strncat.c b/libc/string/strncat.c
index ad8e8dc2b..7ac44561b 100644
--- a/libc/string/strncat.c
+++ b/libc/string/strncat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c
index 37d03c6d4..8a93373b9 100644
--- a/libc/string/strncmp.c
+++ b/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c
index 1a41e6c41..0915e036d 100644
--- a/libc/string/strncpy.c
+++ b/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strndup.c b/libc/string/strndup.c
index c2eda4bfe..e114a2720 100644
--- a/libc/string/strndup.c
+++ b/libc/string/strndup.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1996-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
diff --git a/libc/string/strnlen.c b/libc/string/strnlen.c
index 2363350f4..8d53afbaf 100644
--- a/libc/string/strnlen.c
+++ b/libc/string/strnlen.c
@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
Contributed by Jakub Jelinek <jakub@redhat.com>.
Based on strlen written by Torbjorn Granlund (tege@sics.se),
diff --git a/libc/string/strpbrk.c b/libc/string/strpbrk.c
index 1069094d6..ce33b684e 100644
--- a/libc/string/strpbrk.c
+++ b/libc/string/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strrchr.c b/libc/string/strrchr.c
index bdec841c8..b5b4bc620 100644
--- a/libc/string/strrchr.c
+++ b/libc/string/strrchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strsep.c b/libc/string/strsep.c
index 61e0aea3c..dedd0f107 100644
--- a/libc/string/strsep.c
+++ b/libc/string/strsep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/strsignal.c b/libc/string/strsignal.c
index c4f49dca1..5806081a2 100644
--- a/libc/string/strsignal.c
+++ b/libc/string/strsignal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strspn.c b/libc/string/strspn.c
index a35a7c931..37e8161a2 100644
--- a/libc/string/strspn.c
+++ b/libc/string/strspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strstr.c b/libc/string/strstr.c
index b2f8e74ca..2ae04c644 100644
--- a/libc/string/strstr.c
+++ b/libc/string/strstr.c
@@ -1,5 +1,5 @@
/* Return the offset of one string within another.
- Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ Copyright (C) 1994-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
diff --git a/libc/string/strtok.c b/libc/string/strtok.c
index 5db534508..f7f709908 100644
--- a/libc/string/strtok.c
+++ b/libc/string/strtok.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
index 601000d99..fb5ba8d7a 100644
--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c
@@ -1,5 +1,5 @@
/* Reentrant string tokenizer. Generic version.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-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
diff --git a/libc/string/strverscmp.c b/libc/string/strverscmp.c
index 719b8cecf..7060afcc6 100644
--- a/libc/string/strverscmp.c
+++ b/libc/string/strverscmp.c
@@ -1,5 +1,5 @@
/* Compare strings while treating digits characters numerically.
- Copyright (C) 1997-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
diff --git a/libc/string/strxfrm.c b/libc/string/strxfrm.c
index 069f40b81..22ed3761e 100644
--- a/libc/string/strxfrm.c
+++ b/libc/string/strxfrm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
diff --git a/libc/string/strxfrm_l.c b/libc/string/strxfrm_l.c
index 6e0ec64e4..87073eed5 100644
--- a/libc/string/strxfrm_l.c
+++ b/libc/string/strxfrm_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
diff --git a/libc/string/swab.c b/libc/string/swab.c
index 5766166a3..489eb042c 100644
--- a/libc/string/swab.c
+++ b/libc/string/swab.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-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
diff --git a/libc/string/test-bcopy-ifunc.c b/libc/string/test-bcopy-ifunc.c
deleted file mode 100644
index 9e136e3a3..000000000
--- a/libc/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/libc/string/test-bcopy.c b/libc/string/test-bcopy.c
index dc846d975..dc91f5e81 100644
--- a/libc/string/test-bcopy.c
+++ b/libc/string/test-bcopy.c
@@ -1,5 +1,5 @@
/* Test and measure bcopy functions.
- Copyright (C) 2012-2013 Free Software Foundation, Inc.
+ 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
diff --git a/libc/string/test-bzero-ifunc.c b/libc/string/test-bzero-ifunc.c
deleted file mode 100644
index 7c3ac2ea6..000000000
--- a/libc/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/libc/string/test-bzero.c b/libc/string/test-bzero.c
index 5d3919b3a..f0fd24fa8 100644
--- a/libc/string/test-bzero.c
+++ b/libc/string/test-bzero.c
@@ -1,5 +1,5 @@
/* Test and measure bzero functions.
- Copyright (C) 2012-2013 Free Software Foundation, Inc.
+ 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
diff --git a/libc/string/test-ffs.c b/libc/string/test-ffs.c
index b9ddf4d3a..7ac1dd6bf 100644
--- a/libc/string/test-ffs.c
+++ b/libc/string/test-ffs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
On-Line Applications Research Corporation.
diff --git a/libc/string/test-memccpy-ifunc.c b/libc/string/test-memccpy-ifunc.c
deleted file mode 100644
index aa713abeb..000000000
--- a/libc/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/libc/string/test-memccpy.c b/libc/string/test-memccpy.c
index a3f20a8c4..725d64042 100644
--- a/libc/string/test-memccpy.c
+++ b/libc/string/test-memccpy.c
@@ -1,5 +1,5 @@
/* Test and measure memccpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-memchr-ifunc.c b/libc/string/test-memchr-ifunc.c
deleted file mode 100644
index a390a78b1..000000000
--- a/libc/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/libc/string/test-memchr.c b/libc/string/test-memchr.c
index bc1767c69..0ba79b8b0 100644
--- a/libc/string/test-memchr.c
+++ b/libc/string/test-memchr.c
@@ -1,5 +1,5 @@
/* Test and measure memchr functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-memcmp-ifunc.c b/libc/string/test-memcmp-ifunc.c
deleted file mode 100644
index a333d75ba..000000000
--- a/libc/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/libc/string/test-memcmp.c b/libc/string/test-memcmp.c
index 0420cd0b7..14090edb3 100644
--- a/libc/string/test-memcmp.c
+++ b/libc/string/test-memcmp.c
@@ -1,5 +1,5 @@
/* Test and measure memcmp functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wmemcmp support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011.
diff --git a/libc/string/test-memcpy-ifunc.c b/libc/string/test-memcpy-ifunc.c
deleted file mode 100644
index e8bf92944..000000000
--- a/libc/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/libc/string/test-memcpy.c b/libc/string/test-memcpy.c
index b7ebe5f4e..136c985ab 100644
--- a/libc/string/test-memcpy.c
+++ b/libc/string/test-memcpy.c
@@ -1,5 +1,5 @@
/* Test and measure memcpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-memmem-ifunc.c b/libc/string/test-memmem-ifunc.c
deleted file mode 100644
index d6bca91d4..000000000
--- a/libc/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/libc/string/test-memmem.c b/libc/string/test-memmem.c
index d98ede79e..1b4e4b7ea 100644
--- a/libc/string/test-memmem.c
+++ b/libc/string/test-memmem.c
@@ -1,5 +1,5 @@
/* Test and measure memmem functions.
- Copyright (C) 2008-2013 Free Software Foundation, Inc.
+ Copyright (C) 2008-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@redhat.com>, 2008.
diff --git a/libc/string/test-memmove-ifunc.c b/libc/string/test-memmove-ifunc.c
deleted file mode 100644
index 066f0749e..000000000
--- a/libc/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/libc/string/test-memmove.c b/libc/string/test-memmove.c
index 94576a299..7e1c41c64 100644
--- a/libc/string/test-memmove.c
+++ b/libc/string/test-memmove.c
@@ -1,5 +1,5 @@
/* Test and measure memmove functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-mempcpy-ifunc.c b/libc/string/test-mempcpy-ifunc.c
deleted file mode 100644
index 3b24eb204..000000000
--- a/libc/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/libc/string/test-mempcpy.c b/libc/string/test-mempcpy.c
index 039a91710..ce853b09e 100644
--- a/libc/string/test-mempcpy.c
+++ b/libc/string/test-mempcpy.c
@@ -1,5 +1,5 @@
/* Test and measure mempcpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-memrchr-ifunc.c b/libc/string/test-memrchr-ifunc.c
deleted file mode 100644
index 100dedbac..000000000
--- a/libc/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/libc/string/test-memrchr.c b/libc/string/test-memrchr.c
index a4fe81190..efe4e9fbf 100644
--- a/libc/string/test-memrchr.c
+++ b/libc/string/test-memrchr.c
@@ -1,5 +1,5 @@
/* Test and measure memrchr functions.
- Copyright (C) 2013 Free Software Foundation, Inc.
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-memset-ifunc.c b/libc/string/test-memset-ifunc.c
deleted file mode 100644
index 435cb77a5..000000000
--- a/libc/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/libc/string/test-memset.c b/libc/string/test-memset.c
index 72a390e7d..2171b0d9e 100644
--- a/libc/string/test-memset.c
+++ b/libc/string/test-memset.c
@@ -1,5 +1,5 @@
/* Test and measure memset functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-rawmemchr-ifunc.c b/libc/string/test-rawmemchr-ifunc.c
deleted file mode 100644
index 890045237..000000000
--- a/libc/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/libc/string/test-rawmemchr.c b/libc/string/test-rawmemchr.c
index 9e4952f7c..c718a49dd 100644
--- a/libc/string/test-rawmemchr.c
+++ b/libc/string/test-rawmemchr.c
@@ -1,5 +1,5 @@
/* Test and measure memchr functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-stpcpy-ifunc.c b/libc/string/test-stpcpy-ifunc.c
deleted file mode 100644
index 0755a368e..000000000
--- a/libc/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/libc/string/test-stpcpy.c b/libc/string/test-stpcpy.c
index 2dff927c6..6c3d28c35 100644
--- a/libc/string/test-stpcpy.c
+++ b/libc/string/test-stpcpy.c
@@ -1,5 +1,5 @@
/* Test and measure stpcpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-stpncpy-ifunc.c b/libc/string/test-stpncpy-ifunc.c
deleted file mode 100644
index 43833fdcd..000000000
--- a/libc/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/libc/string/test-stpncpy.c b/libc/string/test-stpncpy.c
index ee9509103..ec7b72b4d 100644
--- a/libc/string/test-stpncpy.c
+++ b/libc/string/test-stpncpy.c
@@ -1,5 +1,5 @@
/* Test and measure stpncpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strcasecmp-ifunc.c b/libc/string/test-strcasecmp-ifunc.c
deleted file mode 100644
index 0cac4ed77..000000000
--- a/libc/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/libc/string/test-strcasecmp.c b/libc/string/test-strcasecmp.c
index bdfcccaa1..11bc65b0c 100644
--- a/libc/string/test-strcasecmp.c
+++ b/libc/string/test-strcasecmp.c
@@ -1,5 +1,5 @@
/* Test and measure strcasecmp functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strcasestr-ifunc.c b/libc/string/test-strcasestr-ifunc.c
deleted file mode 100644
index 77ec32999..000000000
--- a/libc/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/libc/string/test-strcasestr.c b/libc/string/test-strcasestr.c
index 5b1d827a0..1c24506e3 100644
--- a/libc/string/test-strcasestr.c
+++ b/libc/string/test-strcasestr.c
@@ -1,5 +1,5 @@
/* Test and measure strcasestr functions.
- Copyright (C) 2010-2013 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@redhat.com>, 2010.
diff --git a/libc/string/test-strcat-ifunc.c b/libc/string/test-strcat-ifunc.c
deleted file mode 100644
index d9fb5f2c7..000000000
--- a/libc/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/libc/string/test-strcat.c b/libc/string/test-strcat.c
index 89fc90d1d..5b73b11b2 100644
--- a/libc/string/test-strcat.c
+++ b/libc/string/test-strcat.c
@@ -1,5 +1,5 @@
/* Test and measure strcat functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strchr-ifunc.c b/libc/string/test-strchr-ifunc.c
deleted file mode 100644
index 2f758a990..000000000
--- a/libc/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/libc/string/test-strchr.c b/libc/string/test-strchr.c
index cbcf53ef8..12cd9d84e 100644
--- a/libc/string/test-strchr.c
+++ b/libc/string/test-strchr.c
@@ -1,5 +1,5 @@
/* Test and measure STRCHR functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcschr support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
diff --git a/libc/string/test-strchrnul-ifunc.c b/libc/string/test-strchrnul-ifunc.c
deleted file mode 100644
index 632a0341b..000000000
--- a/libc/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/libc/string/test-strchrnul.c b/libc/string/test-strchrnul.c
index 43f2f1ea0..9d5d819a7 100644
--- a/libc/string/test-strchrnul.c
+++ b/libc/string/test-strchrnul.c
@@ -1,6 +1,6 @@
/* Test and measure strchrnul function.
- Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ Copyright (C) 2011-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
diff --git a/libc/string/test-strcmp-ifunc.c b/libc/string/test-strcmp-ifunc.c
deleted file mode 100644
index f6a8c9408..000000000
--- a/libc/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/libc/string/test-strcmp.c b/libc/string/test-strcmp.c
index f66699392..b395dc7fb 100644
--- a/libc/string/test-strcmp.c
+++ b/libc/string/test-strcmp.c
@@ -1,5 +1,5 @@
/* Test and measure strcmp and wcscmp functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcscmp support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011.
diff --git a/libc/string/test-strcpy-ifunc.c b/libc/string/test-strcpy-ifunc.c
deleted file mode 100644
index e4ec2059e..000000000
--- a/libc/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/libc/string/test-strcpy.c b/libc/string/test-strcpy.c
index d97326795..e244db536 100644
--- a/libc/string/test-strcpy.c
+++ b/libc/string/test-strcpy.c
@@ -1,5 +1,5 @@
/* Test and measure strcpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcscpy support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
diff --git a/libc/string/test-strcspn-ifunc.c b/libc/string/test-strcspn-ifunc.c
deleted file mode 100644
index 0dce0c411..000000000
--- a/libc/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/libc/string/test-strcspn.c b/libc/string/test-strcspn.c
index 84b2301cd..5ea50a669 100644
--- a/libc/string/test-strcspn.c
+++ b/libc/string/test-strcspn.c
@@ -1,5 +1,5 @@
/* Test and measure strcspn functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-string.h b/libc/string/test-string.h
index afb6980d5..4d9a39de3 100644
--- a/libc/string/test-string.h
+++ b/libc/string/test-string.h
@@ -1,5 +1,5 @@
/* Test and measure string and memory functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
@@ -18,6 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <sys/cdefs.h>
+#define TEST_IFUNC
typedef struct
{
diff --git a/libc/string/test-strlen-ifunc.c b/libc/string/test-strlen-ifunc.c
deleted file mode 100644
index 8cf6755ec..000000000
--- a/libc/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/libc/string/test-strlen.c b/libc/string/test-strlen.c
index f8b791d0f..046a19435 100644
--- a/libc/string/test-strlen.c
+++ b/libc/string/test-strlen.c
@@ -1,5 +1,5 @@
/* Test and measure STRLEN functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcslen support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
diff --git a/libc/string/test-strncasecmp-ifunc.c b/libc/string/test-strncasecmp-ifunc.c
deleted file mode 100644
index bafcf0267..000000000
--- a/libc/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/libc/string/test-strncasecmp.c b/libc/string/test-strncasecmp.c
index 00eca4a26..6ad54e091 100644
--- a/libc/string/test-strncasecmp.c
+++ b/libc/string/test-strncasecmp.c
@@ -1,5 +1,5 @@
/* Test and measure strncasecmp functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strncat-ifunc.c b/libc/string/test-strncat-ifunc.c
deleted file mode 100644
index d1e035492..000000000
--- a/libc/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/libc/string/test-strncat.c b/libc/string/test-strncat.c
index 6cdd5e723..4915c5958 100644
--- a/libc/string/test-strncat.c
+++ b/libc/string/test-strncat.c
@@ -1,5 +1,5 @@
/* Test and measure strncat functions.
- Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 Free Software Foundation, Inc.
Contributed by Intel Corporation.
The GNU C Library is free software; you can redistribute it and/or
diff --git a/libc/string/test-strncmp-ifunc.c b/libc/string/test-strncmp-ifunc.c
deleted file mode 100644
index c4a5b3b52..000000000
--- a/libc/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/libc/string/test-strncmp.c b/libc/string/test-strncmp.c
index 47c33e33b..f3b2c6801 100644
--- a/libc/string/test-strncmp.c
+++ b/libc/string/test-strncmp.c
@@ -1,5 +1,5 @@
/* Test and measure strncmp functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strncpy-ifunc.c b/libc/string/test-strncpy-ifunc.c
deleted file mode 100644
index 04de13221..000000000
--- a/libc/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/libc/string/test-strncpy.c b/libc/string/test-strncpy.c
index ac0e0004d..2326acc6f 100644
--- a/libc/string/test-strncpy.c
+++ b/libc/string/test-strncpy.c
@@ -1,5 +1,5 @@
/* Test and measure strncpy functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strnlen-ifunc.c b/libc/string/test-strnlen-ifunc.c
deleted file mode 100644
index 5722b8f96..000000000
--- a/libc/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/libc/string/test-strnlen.c b/libc/string/test-strnlen.c
index bc7459bbe..be9edd2aa 100644
--- a/libc/string/test-strnlen.c
+++ b/libc/string/test-strnlen.c
@@ -1,5 +1,5 @@
/* Test and measure strlen functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strpbrk-ifunc.c b/libc/string/test-strpbrk-ifunc.c
deleted file mode 100644
index be6f03161..000000000
--- a/libc/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/libc/string/test-strpbrk.c b/libc/string/test-strpbrk.c
index 9f1b4a769..bd981618a 100644
--- a/libc/string/test-strpbrk.c
+++ b/libc/string/test-strpbrk.c
@@ -1,5 +1,5 @@
/* Test and measure strpbrk functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strrchr-ifunc.c b/libc/string/test-strrchr-ifunc.c
deleted file mode 100644
index 83e2348c3..000000000
--- a/libc/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/libc/string/test-strrchr.c b/libc/string/test-strrchr.c
index f5afe7539..12d7c9f77 100644
--- a/libc/string/test-strrchr.c
+++ b/libc/string/test-strrchr.c
@@ -1,5 +1,5 @@
/* Test and measure STRCHR functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
Added wcsrrchr support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>,
diff --git a/libc/string/test-strspn-ifunc.c b/libc/string/test-strspn-ifunc.c
deleted file mode 100644
index ae9de0799..000000000
--- a/libc/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/libc/string/test-strspn.c b/libc/string/test-strspn.c
index 4943faaed..56dcf5378 100644
--- a/libc/string/test-strspn.c
+++ b/libc/string/test-strspn.c
@@ -1,5 +1,5 @@
/* Test and measure strspn functions.
- Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
diff --git a/libc/string/test-strstr-ifunc.c b/libc/string/test-strstr-ifunc.c
deleted file mode 100644
index 42e9c5e39..000000000
--- a/libc/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"
diff --git a/libc/string/test-strstr.c b/libc/string/test-strstr.c
index 4e49007f3..5547186c9 100644
--- a/libc/string/test-strstr.c
+++ b/libc/string/test-strstr.c
@@ -1,5 +1,5 @@
/* Test and measure strstr functions.
- Copyright (C) 2010-2013 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@redhat.com>, 2010.
diff --git a/libc/string/testcopy.c b/libc/string/testcopy.c
index 684c41fc8..d0afdc868 100644
--- a/libc/string/testcopy.c
+++ b/libc/string/testcopy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1990-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1990-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
diff --git a/libc/string/tester.c b/libc/string/tester.c
index f1ea4381d..62905a7d2 100644
--- a/libc/string/tester.c
+++ b/libc/string/tester.c
@@ -1,5 +1,5 @@
/* Tester for string functions.
- Copyright (C) 1995-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995-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
diff --git a/libc/string/tst-bswap.c b/libc/string/tst-bswap.c
index 9230c4bed..cca704c0d 100644
--- a/libc/string/tst-bswap.c
+++ b/libc/string/tst-bswap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>.
diff --git a/libc/string/tst-inlcall.c b/libc/string/tst-inlcall.c
index a35198709..32d88631f 100644
--- a/libc/string/tst-inlcall.c
+++ b/libc/string/tst-inlcall.c
@@ -1,5 +1,5 @@
/* Tester for calling inline string functions.
- Copyright (C) 1998-2013 Free Software Foundation, Inc.
+ Copyright (C) 1998-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
diff --git a/libc/string/tst-strcoll-overflow.c b/libc/string/tst-strcoll-overflow.c
index bb665ac51..e7a43ea84 100644
--- a/libc/string/tst-strcoll-overflow.c
+++ b/libc/string/tst-strcoll-overflow.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Free Software Foundation, Inc.
+/* Copyright (C) 2013-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
diff --git a/libc/string/tst-strtok_r.c b/libc/string/tst-strtok_r.c
index d5a445fee..b1e89a425 100644
--- a/libc/string/tst-strtok_r.c
+++ b/libc/string/tst-strtok_r.c
@@ -1,5 +1,5 @@
/* Test strtok_r regression for BZ #14229.
- Copyright (C) 2012-2013 Free Software Foundation, Inc.
+ 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
diff --git a/libc/string/wordcopy.c b/libc/string/wordcopy.c
index 726894b6e..ff4cce470 100644
--- a/libc/string/wordcopy.c
+++ b/libc/string/wordcopy.c
@@ -1,5 +1,5 @@
/* _memcopy.c -- subroutines for memory copy functions.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Torbjorn Granlund (tege@sics.se).
@@ -26,11 +26,12 @@
block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
Both SRCP and DSTP should be aligned for memory operations on `op_t's. */
+#ifndef WORDCOPY_FWD_ALIGNED
+# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned
+#endif
+
void
-_wordcopy_fwd_aligned (dstp, srcp, len)
- long int dstp;
- long int srcp;
- size_t len;
+WORDCOPY_FWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@@ -134,11 +135,12 @@ _wordcopy_fwd_aligned (dstp, srcp, len)
DSTP should be aligned for memory operations on `op_t's, but SRCP must
*not* be aligned. */
+#ifndef WORDCOPY_FWD_DEST_ALIGNED
+# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned
+#endif
+
void
-_wordcopy_fwd_dest_aligned (dstp, srcp, len)
- long int dstp;
- long int srcp;
- size_t len;
+WORDCOPY_FWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2, a3;
int sh_1, sh_2;
@@ -221,11 +223,12 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len)
(not LEN bytes!). Both SRCP and DSTP should be aligned for memory
operations on `op_t's. */
+#ifndef WORDCOPY_BWD_ALIGNED
+# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned
+#endif
+
void
-_wordcopy_bwd_aligned (dstp, srcp, len)
- long int dstp;
- long int srcp;
- size_t len;
+WORDCOPY_BWD_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1;
@@ -329,11 +332,12 @@ _wordcopy_bwd_aligned (dstp, srcp, len)
words (not LEN bytes!). DSTP should be aligned for memory
operations on `op_t', but SRCP must *not* be aligned. */
+#ifndef WORDCOPY_BWD_DEST_ALIGNED
+# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned
+#endif
+
void
-_wordcopy_bwd_dest_aligned (dstp, srcp, len)
- long int dstp;
- long int srcp;
- size_t len;
+WORDCOPY_BWD_DEST_ALIGNED (long int dstp, long int srcp, size_t len)
{
op_t a0, a1, a2, a3;
int sh_1, sh_2;
diff --git a/libc/string/xpg-strerror.c b/libc/string/xpg-strerror.c
index 79214143c..36e2548db 100644
--- a/libc/string/xpg-strerror.c
+++ b/libc/string/xpg-strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-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