This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-189-g7312ca9
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2012 18:39:40 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-189-g7312ca9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 7312ca90dc2fc5fd56440274f8b17cc8e6999581 (commit)
via 9a0a54864bc015efbbbd15dcf365bcb2c147fb90 (commit)
from 67cc348d55b886eac7c3b3b028d22ec8e8c349a4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7312ca90dc2fc5fd56440274f8b17cc8e6999581
commit 7312ca90dc2fc5fd56440274f8b17cc8e6999581
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 15 11:38:57 2012 -0700
Clean up x86_64/multiarch/strstr-c.c include order.
diff --git a/ChangeLog b/ChangeLog
index 6b5f6c8..886c420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-08-15 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/x86_64/multiarch/strstr-c.c: Add copyright header.
+ Move #define and #undef of memmove to just before and after
+ including <string.h>.
+
* sysdeps/x86_64/multiarch/memmove.c: Don't include <stddef.h>.
[!NOT_IN_libc]: Move #define and #undef of memmove to just before
and after including <string.h>. Move declarations of
diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c
index 795789e..e05c5f1 100644
--- a/sysdeps/x86_64/multiarch/strstr-c.c
+++ b/sysdeps/x86_64/multiarch/strstr-c.c
@@ -1,4 +1,27 @@
-#include "init-arch.h"
+/* Multiple versions of strstr.
+ Copyright (C) 2012 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/>. */
+
+/* Redefine strstr so that the compiler won't complain about the type
+ mismatch with the IFUNC selector in strong_alias, below. */
+#undef strstr
+#define strstr __redirect_strstr
+#include <string.h>
+#undef strstr
#define STRSTR __strstr_sse2
#ifdef SHARED
@@ -7,16 +30,13 @@
__hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2);
#endif
-/* Redefine strstr so that the compiler won't complain about the type
- mismatch with the IFUNC selector in strong_alias, below. */
-#undef strstr
-#define strstr __redirect_strstr
-
#include "string/strstr.c"
extern __typeof (__redirect_strstr) __strstr_sse42 attribute_hidden;
extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden;
+#include "init-arch.h"
+
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
extern __typeof (__redirect_strstr) __libc_strstr;
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9a0a54864bc015efbbbd15dcf365bcb2c147fb90
commit 9a0a54864bc015efbbbd15dcf365bcb2c147fb90
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 15 11:26:02 2012 -0700
Clean up x86_64/multiarch/memmove.c include order.
diff --git a/ChangeLog b/ChangeLog
index 7ab9bc3..6b5f6c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-08-15 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/x86_64/multiarch/memmove.c: Don't include <stddef.h>.
+ [!NOT_IN_libc]: Move #define and #undef of memmove to just before
+ and after including <string.h>. Move declarations of
+ __memmove_sse2, __memmove_ssse3, and __memmove_ssse3_back
+ to before #include "string/memmove.c".
+
* include/dirent.h: Declare __getdirentries.
* sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c
index 6e91025..d6bdab4 100644
--- a/sysdeps/x86_64/multiarch/memmove.c
+++ b/sysdeps/x86_64/multiarch/memmove.c
@@ -1,6 +1,5 @@
/* Multiple versions of memmove.
- Copyright (C) 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2010-2012 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
@@ -17,31 +16,31 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <stddef.h>
-
#ifndef NOT_IN_libc
-#include <shlib-compat.h>
-#include "init-arch.h"
-
-#define MEMMOVE __memmove_sse2
-#ifdef SHARED
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name) \
+# define MEMMOVE __memmove_sse2
+# ifdef SHARED
+# undef libc_hidden_builtin_def
+# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__memmove_sse2, __GI_memmove, __memmove_sse2);
-#endif
+# endif
/* Redefine memmove so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
-#undef memmove
-#define memmove __redirect_memmove
+# undef memmove
+# define memmove __redirect_memmove
+# include <string.h>
+# undef memmove
+
+extern __typeof (__redirect_memmove) __memmove_sse2 attribute_hidden;
+extern __typeof (__redirect_memmove) __memmove_ssse3 attribute_hidden;
+extern __typeof (__redirect_memmove) __memmove_ssse3_back attribute_hidden;
#endif
#include "string/memmove.c"
#ifndef NOT_IN_libc
-extern __typeof (__redirect_memmove) __memmove_sse2 attribute_hidden;
-extern __typeof (__redirect_memmove) __memmove_ssse3 attribute_hidden;
-extern __typeof (__redirect_memmove) __memmove_ssse3_back attribute_hidden;
+# include <shlib-compat.h>
+# include "init-arch.h"
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
@@ -52,10 +51,9 @@ libc_ifunc (__libc_memmove,
? __memmove_ssse3_back : __memmove_ssse3)
: __memmove_sse2)
-#undef memmove
strong_alias (__libc_memmove, memmove)
-#if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
+# if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
compat_symbol (libc, memmove, memcpy, GLIBC_2_2_5);
-#endif
+# endif
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 +++++++++
sysdeps/x86_64/multiarch/memmove.c | 38 ++++++++++++++++------------------
sysdeps/x86_64/multiarch/strstr-c.c | 32 +++++++++++++++++++++++-----
3 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7ab9bc3..886c420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-08-15 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/x86_64/multiarch/strstr-c.c: Add copyright header.
+ Move #define and #undef of memmove to just before and after
+ including <string.h>.
+
+ * sysdeps/x86_64/multiarch/memmove.c: Don't include <stddef.h>.
+ [!NOT_IN_libc]: Move #define and #undef of memmove to just before
+ and after including <string.h>. Move declarations of
+ __memmove_sse2, __memmove_ssse3, and __memmove_ssse3_back
+ to before #include "string/memmove.c".
+
* include/dirent.h: Declare __getdirentries.
* sysdeps/posix/system.c (do_system): Cast SUB_REF () to void when not
diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c
index 6e91025..d6bdab4 100644
--- a/sysdeps/x86_64/multiarch/memmove.c
+++ b/sysdeps/x86_64/multiarch/memmove.c
@@ -1,6 +1,5 @@
/* Multiple versions of memmove.
- Copyright (C) 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2010-2012 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
@@ -17,31 +16,31 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <stddef.h>
-
#ifndef NOT_IN_libc
-#include <shlib-compat.h>
-#include "init-arch.h"
-
-#define MEMMOVE __memmove_sse2
-#ifdef SHARED
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name) \
+# define MEMMOVE __memmove_sse2
+# ifdef SHARED
+# undef libc_hidden_builtin_def
+# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__memmove_sse2, __GI_memmove, __memmove_sse2);
-#endif
+# endif
/* Redefine memmove so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
-#undef memmove
-#define memmove __redirect_memmove
+# undef memmove
+# define memmove __redirect_memmove
+# include <string.h>
+# undef memmove
+
+extern __typeof (__redirect_memmove) __memmove_sse2 attribute_hidden;
+extern __typeof (__redirect_memmove) __memmove_ssse3 attribute_hidden;
+extern __typeof (__redirect_memmove) __memmove_ssse3_back attribute_hidden;
#endif
#include "string/memmove.c"
#ifndef NOT_IN_libc
-extern __typeof (__redirect_memmove) __memmove_sse2 attribute_hidden;
-extern __typeof (__redirect_memmove) __memmove_ssse3 attribute_hidden;
-extern __typeof (__redirect_memmove) __memmove_ssse3_back attribute_hidden;
+# include <shlib-compat.h>
+# include "init-arch.h"
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
@@ -52,10 +51,9 @@ libc_ifunc (__libc_memmove,
? __memmove_ssse3_back : __memmove_ssse3)
: __memmove_sse2)
-#undef memmove
strong_alias (__libc_memmove, memmove)
-#if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
+# if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
compat_symbol (libc, memmove, memcpy, GLIBC_2_2_5);
-#endif
+# endif
#endif
diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c
index 795789e..e05c5f1 100644
--- a/sysdeps/x86_64/multiarch/strstr-c.c
+++ b/sysdeps/x86_64/multiarch/strstr-c.c
@@ -1,4 +1,27 @@
-#include "init-arch.h"
+/* Multiple versions of strstr.
+ Copyright (C) 2012 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/>. */
+
+/* Redefine strstr so that the compiler won't complain about the type
+ mismatch with the IFUNC selector in strong_alias, below. */
+#undef strstr
+#define strstr __redirect_strstr
+#include <string.h>
+#undef strstr
#define STRSTR __strstr_sse2
#ifdef SHARED
@@ -7,16 +30,13 @@
__hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2);
#endif
-/* Redefine strstr so that the compiler won't complain about the type
- mismatch with the IFUNC selector in strong_alias, below. */
-#undef strstr
-#define strstr __redirect_strstr
-
#include "string/strstr.c"
extern __typeof (__redirect_strstr) __strstr_sse42 attribute_hidden;
extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden;
+#include "init-arch.h"
+
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
extern __typeof (__redirect_strstr) __libc_strstr;
hooks/post-receive
--
GNU C Library master sources