| Message ID | 20170709125356.GA25323@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sun, Jul 9, 2017 at 5:53 AM, H.J. Lu <hjl.tools@gmail.com> wrote: > Any objections? I am checking it in now. > H.J. > --- > * sysdeps/x86_64/multiarch/memcmp.c: Update comments. > * sysdeps/x86_64/multiarch/memmove.c: Likewise. > * sysdeps/x86_64/multiarch/memrchr.c: Likewise. > * sysdeps/x86_64/multiarch/memset.c: Likewise. > * sysdeps/x86_64/multiarch/rawmemchr.c: Likewise. > * sysdeps/x86_64/multiarch/strchrnul.c: Likewise. > * sysdeps/x86_64/multiarch/strlen.c: Likewise. > * sysdeps/x86_64/multiarch/strnlen.c: Likewise. > * sysdeps/x86_64/multiarch/wcschr.c: Likewise. > * sysdeps/x86_64/multiarch/wcscpy.c: Likewise. > * sysdeps/x86_64/multiarch/wcslen.c: Likewise. > * sysdeps/x86_64/multiarch/wcsnlen.c: Likewise. > * sysdeps/x86_64/multiarch/wmemchr.c: Likewise. > * sysdeps/x86_64/multiarch/wmemcmp.c: Likewise. > * sysdeps/x86_64/multiarch/wmemset.c: Likewise. > * sysdeps/x86_64/multiarch/wmemset_chk.c: Likewise. > --- > sysdeps/x86_64/multiarch/memcmp.c | 3 +-- > sysdeps/x86_64/multiarch/memmove.c | 3 +-- > sysdeps/x86_64/multiarch/memrchr.c | 2 +- > sysdeps/x86_64/multiarch/memset.c | 4 +--- > sysdeps/x86_64/multiarch/rawmemchr.c | 2 +- > sysdeps/x86_64/multiarch/strchrnul.c | 2 +- > sysdeps/x86_64/multiarch/strlen.c | 2 +- > sysdeps/x86_64/multiarch/strnlen.c | 2 +- > sysdeps/x86_64/multiarch/wcschr.c | 2 +- > sysdeps/x86_64/multiarch/wcscpy.c | 2 +- > sysdeps/x86_64/multiarch/wcslen.c | 2 +- > sysdeps/x86_64/multiarch/wcsnlen.c | 2 +- > sysdeps/x86_64/multiarch/wmemchr.c | 2 +- > sysdeps/x86_64/multiarch/wmemcmp.c | 3 +-- > sysdeps/x86_64/multiarch/wmemset.c | 2 +- > sysdeps/x86_64/multiarch/wmemset_chk.c | 2 +- > 16 files changed, 16 insertions(+), 21 deletions(-) > > diff --git a/sysdeps/x86_64/multiarch/memcmp.c b/sysdeps/x86_64/multiarch/memcmp.c > index b3e4ac3..87f7593 100644 > --- a/sysdeps/x86_64/multiarch/memcmp.c > +++ b/sysdeps/x86_64/multiarch/memcmp.c > @@ -17,8 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in lib and for > - DSO. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define memcmp __redirect_memcmp > # include <string.h> > diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c > index c615808..0b01b16 100644 > --- a/sysdeps/x86_64/multiarch/memmove.c > +++ b/sysdeps/x86_64/multiarch/memmove.c > @@ -17,8 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in lib and for > - DSO. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define memmove __redirect_memmove > # include <string.h> > diff --git a/sysdeps/x86_64/multiarch/memrchr.c b/sysdeps/x86_64/multiarch/memrchr.c > index 003d403..270406a 100644 > --- a/sysdeps/x86_64/multiarch/memrchr.c > +++ b/sysdeps/x86_64/multiarch/memrchr.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define memrchr __redirect_memrchr > # include <string.h> > diff --git a/sysdeps/x86_64/multiarch/memset.c b/sysdeps/x86_64/multiarch/memset.c > index e3f5eaa..50181ac 100644 > --- a/sysdeps/x86_64/multiarch/memset.c > +++ b/sysdeps/x86_64/multiarch/memset.c > @@ -17,9 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in lib and for > - DSO. In static binaries we need memset before the initialization > - happened. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define memset __redirect_memset > # include <string.h> > diff --git a/sysdeps/x86_64/multiarch/rawmemchr.c b/sysdeps/x86_64/multiarch/rawmemchr.c > index c97cfa2..78db3ff 100644 > --- a/sysdeps/x86_64/multiarch/rawmemchr.c > +++ b/sysdeps/x86_64/multiarch/rawmemchr.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define rawmemchr __redirect_rawmemchr > # define __rawmemchr __redirect___rawmemchr > diff --git a/sysdeps/x86_64/multiarch/strchrnul.c b/sysdeps/x86_64/multiarch/strchrnul.c > index 4a4c55a..bc9bf9c 100644 > --- a/sysdeps/x86_64/multiarch/strchrnul.c > +++ b/sysdeps/x86_64/multiarch/strchrnul.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define strchrnul __redirect_strchrnul > # define __strchrnul __redirect___strchrnul > diff --git a/sysdeps/x86_64/multiarch/strlen.c b/sysdeps/x86_64/multiarch/strlen.c > index 7e008a0..a9ec686 100644 > --- a/sysdeps/x86_64/multiarch/strlen.c > +++ b/sysdeps/x86_64/multiarch/strlen.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define strlen __redirect_strlen > # include <string.h> > diff --git a/sysdeps/x86_64/multiarch/strnlen.c b/sysdeps/x86_64/multiarch/strnlen.c > index ff450bd..0c1e21e 100644 > --- a/sysdeps/x86_64/multiarch/strnlen.c > +++ b/sysdeps/x86_64/multiarch/strnlen.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define strnlen __redirect_strnlen > # define __strnlen __redirect___strnlen > diff --git a/sysdeps/x86_64/multiarch/wcschr.c b/sysdeps/x86_64/multiarch/wcschr.c > index 70d3692..0294b27 100644 > --- a/sysdeps/x86_64/multiarch/wcschr.c > +++ b/sysdeps/x86_64/multiarch/wcschr.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define wcschr __redirect_wcschr > # define __wcschr __redirect___wcschr > diff --git a/sysdeps/x86_64/multiarch/wcscpy.c b/sysdeps/x86_64/multiarch/wcscpy.c > index 01dee80..6dffedb 100644 > --- a/sysdeps/x86_64/multiarch/wcscpy.c > +++ b/sysdeps/x86_64/multiarch/wcscpy.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define wcscpy __redirect_wcscpy > # include <wchar.h> > diff --git a/sysdeps/x86_64/multiarch/wcslen.c b/sysdeps/x86_64/multiarch/wcslen.c > index 9ff065c..0bb48f8 100644 > --- a/sysdeps/x86_64/multiarch/wcslen.c > +++ b/sysdeps/x86_64/multiarch/wcslen.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define __wcslen __redirect_wcslen > # include <wchar.h> > diff --git a/sysdeps/x86_64/multiarch/wcsnlen.c b/sysdeps/x86_64/multiarch/wcsnlen.c > index 1e3f3c5..8cdaee1 100644 > --- a/sysdeps/x86_64/multiarch/wcsnlen.c > +++ b/sysdeps/x86_64/multiarch/wcsnlen.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define __wcsnlen __redirect_wcsnlen > # include <wchar.h> > diff --git a/sysdeps/x86_64/multiarch/wmemchr.c b/sysdeps/x86_64/multiarch/wmemchr.c > index bde0ec4..9065b65 100644 > --- a/sysdeps/x86_64/multiarch/wmemchr.c > +++ b/sysdeps/x86_64/multiarch/wmemchr.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define wmemchr __redirect_wmemchr > # define __wmemchr __redirect___wmemchr > diff --git a/sysdeps/x86_64/multiarch/wmemcmp.c b/sysdeps/x86_64/multiarch/wmemcmp.c > index bbf6c83..b1ba36a 100644 > --- a/sysdeps/x86_64/multiarch/wmemcmp.c > +++ b/sysdeps/x86_64/multiarch/wmemcmp.c > @@ -17,8 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in lib and for > - DSO. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define wmemcmp __redirect_wmemcmp > # include <wchar.h> > diff --git a/sysdeps/x86_64/multiarch/wmemset.c b/sysdeps/x86_64/multiarch/wmemset.c > index b5bc2f9..6231307 100644 > --- a/sysdeps/x86_64/multiarch/wmemset.c > +++ b/sysdeps/x86_64/multiarch/wmemset.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc. */ > +/* Define multiple versions only for the definition in libc. */ > #if IS_IN (libc) > # define wmemset __redirect_wmemset > # define __wmemset __redirect___wmemset > diff --git a/sysdeps/x86_64/multiarch/wmemset_chk.c b/sysdeps/x86_64/multiarch/wmemset_chk.c > index d3ded55..ec6f02a 100644 > --- a/sysdeps/x86_64/multiarch/wmemset_chk.c > +++ b/sysdeps/x86_64/multiarch/wmemset_chk.c > @@ -17,7 +17,7 @@ > License along with the GNU C Library; if not, see > <http://www.gnu.org/licenses/>. */ > > -/* Define multiple versions only for the definition in libc.so. */ > +/* Define multiple versions only for the definition in libc.so. */ > #if IS_IN (libc) && defined SHARED > # define __wmemset_chk __redirect_wmemset_chk > # include <wchar.h> > -- > 2.9.4 >
diff --git a/sysdeps/x86_64/multiarch/memcmp.c b/sysdeps/x86_64/multiarch/memcmp.c index b3e4ac3..87f7593 100644 --- a/sysdeps/x86_64/multiarch/memcmp.c +++ b/sysdeps/x86_64/multiarch/memcmp.c @@ -17,8 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in lib and for - DSO. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memcmp __redirect_memcmp # include <string.h> diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c index c615808..0b01b16 100644 --- a/sysdeps/x86_64/multiarch/memmove.c +++ b/sysdeps/x86_64/multiarch/memmove.c @@ -17,8 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in lib and for - DSO. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memmove __redirect_memmove # include <string.h> diff --git a/sysdeps/x86_64/multiarch/memrchr.c b/sysdeps/x86_64/multiarch/memrchr.c index 003d403..270406a 100644 --- a/sysdeps/x86_64/multiarch/memrchr.c +++ b/sysdeps/x86_64/multiarch/memrchr.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memrchr __redirect_memrchr # include <string.h> diff --git a/sysdeps/x86_64/multiarch/memset.c b/sysdeps/x86_64/multiarch/memset.c index e3f5eaa..50181ac 100644 --- a/sysdeps/x86_64/multiarch/memset.c +++ b/sysdeps/x86_64/multiarch/memset.c @@ -17,9 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in lib and for - DSO. In static binaries we need memset before the initialization - happened. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memset __redirect_memset # include <string.h> diff --git a/sysdeps/x86_64/multiarch/rawmemchr.c b/sysdeps/x86_64/multiarch/rawmemchr.c index c97cfa2..78db3ff 100644 --- a/sysdeps/x86_64/multiarch/rawmemchr.c +++ b/sysdeps/x86_64/multiarch/rawmemchr.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define rawmemchr __redirect_rawmemchr # define __rawmemchr __redirect___rawmemchr diff --git a/sysdeps/x86_64/multiarch/strchrnul.c b/sysdeps/x86_64/multiarch/strchrnul.c index 4a4c55a..bc9bf9c 100644 --- a/sysdeps/x86_64/multiarch/strchrnul.c +++ b/sysdeps/x86_64/multiarch/strchrnul.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define strchrnul __redirect_strchrnul # define __strchrnul __redirect___strchrnul diff --git a/sysdeps/x86_64/multiarch/strlen.c b/sysdeps/x86_64/multiarch/strlen.c index 7e008a0..a9ec686 100644 --- a/sysdeps/x86_64/multiarch/strlen.c +++ b/sysdeps/x86_64/multiarch/strlen.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define strlen __redirect_strlen # include <string.h> diff --git a/sysdeps/x86_64/multiarch/strnlen.c b/sysdeps/x86_64/multiarch/strnlen.c index ff450bd..0c1e21e 100644 --- a/sysdeps/x86_64/multiarch/strnlen.c +++ b/sysdeps/x86_64/multiarch/strnlen.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define strnlen __redirect_strnlen # define __strnlen __redirect___strnlen diff --git a/sysdeps/x86_64/multiarch/wcschr.c b/sysdeps/x86_64/multiarch/wcschr.c index 70d3692..0294b27 100644 --- a/sysdeps/x86_64/multiarch/wcschr.c +++ b/sysdeps/x86_64/multiarch/wcschr.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define wcschr __redirect_wcschr # define __wcschr __redirect___wcschr diff --git a/sysdeps/x86_64/multiarch/wcscpy.c b/sysdeps/x86_64/multiarch/wcscpy.c index 01dee80..6dffedb 100644 --- a/sysdeps/x86_64/multiarch/wcscpy.c +++ b/sysdeps/x86_64/multiarch/wcscpy.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define wcscpy __redirect_wcscpy # include <wchar.h> diff --git a/sysdeps/x86_64/multiarch/wcslen.c b/sysdeps/x86_64/multiarch/wcslen.c index 9ff065c..0bb48f8 100644 --- a/sysdeps/x86_64/multiarch/wcslen.c +++ b/sysdeps/x86_64/multiarch/wcslen.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define __wcslen __redirect_wcslen # include <wchar.h> diff --git a/sysdeps/x86_64/multiarch/wcsnlen.c b/sysdeps/x86_64/multiarch/wcsnlen.c index 1e3f3c5..8cdaee1 100644 --- a/sysdeps/x86_64/multiarch/wcsnlen.c +++ b/sysdeps/x86_64/multiarch/wcsnlen.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define __wcsnlen __redirect_wcsnlen # include <wchar.h> diff --git a/sysdeps/x86_64/multiarch/wmemchr.c b/sysdeps/x86_64/multiarch/wmemchr.c index bde0ec4..9065b65 100644 --- a/sysdeps/x86_64/multiarch/wmemchr.c +++ b/sysdeps/x86_64/multiarch/wmemchr.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define wmemchr __redirect_wmemchr # define __wmemchr __redirect___wmemchr diff --git a/sysdeps/x86_64/multiarch/wmemcmp.c b/sysdeps/x86_64/multiarch/wmemcmp.c index bbf6c83..b1ba36a 100644 --- a/sysdeps/x86_64/multiarch/wmemcmp.c +++ b/sysdeps/x86_64/multiarch/wmemcmp.c @@ -17,8 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in lib and for - DSO. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define wmemcmp __redirect_wmemcmp # include <wchar.h> diff --git a/sysdeps/x86_64/multiarch/wmemset.c b/sysdeps/x86_64/multiarch/wmemset.c index b5bc2f9..6231307 100644 --- a/sysdeps/x86_64/multiarch/wmemset.c +++ b/sysdeps/x86_64/multiarch/wmemset.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc. */ +/* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define wmemset __redirect_wmemset # define __wmemset __redirect___wmemset diff --git a/sysdeps/x86_64/multiarch/wmemset_chk.c b/sysdeps/x86_64/multiarch/wmemset_chk.c index d3ded55..ec6f02a 100644 --- a/sysdeps/x86_64/multiarch/wmemset_chk.c +++ b/sysdeps/x86_64/multiarch/wmemset_chk.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Define multiple versions only for the definition in libc.so. */ +/* Define multiple versions only for the definition in libc.so. */ #if IS_IN (libc) && defined SHARED # define __wmemset_chk __redirect_wmemset_chk # include <wchar.h>