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.19-179-g9290130
- From: willnewton at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Mar 2014 16:06:03 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-179-g9290130
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 9290130a8de3f30970f741c79dfe8459f798e05f (commit)
via afb466fcb034f594e083b5664fa60a0d4f54c41b (commit)
via f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421 (commit)
via 53f1bed39263541ef7f3d86f9701005524938016 (commit)
via 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb (commit)
from ae42bbc55a9e05976269026ddabcfb917f6e922f (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9290130a8de3f30970f741c79dfe8459f798e05f
commit 9290130a8de3f30970f741c79dfe8459f798e05f
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 12:07:10 2014 +0000
Fix HAVE_RM_CTX -Wundef warnings
ChangeLog:
2014-03-17 Will Newton <will.newton@linaro.org>
* sysdeps/generic/math_private.h: Check whether
HAVE_RM_CTX is defined with #ifdef rather
than #if.
diff --git a/ChangeLog b/ChangeLog
index 37d34f6..f6b90d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * sysdeps/generic/math_private.h: Check whether
+ HAVE_RM_CTX is defined with #ifdef rather
+ than #if.
+
* argp/argp-fmtstream.h: Check whether
__STRICT_ANSI__ is defined with #ifdef rather
than #if.
diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 9b881a3..0ac70e3 100644
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -551,7 +551,7 @@ default_libc_feupdateenv_test (fenv_t *e, int ex)
# define libc_feresetround_noexl libc_fesetenvl
#endif
-#if HAVE_RM_CTX
+#ifdef HAVE_RM_CTX
/* Set/Restore Rounding Modes only when necessary. If defined, these functions
set/restore floating point state only if the state needed within the lexical
block is different from the current state. This saves a lot of time when
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=afb466fcb034f594e083b5664fa60a0d4f54c41b
commit afb466fcb034f594e083b5664fa60a0d4f54c41b
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 11:06:02 2014 +0000
Fix __STRICT_ANSI__ -Wundef warnings
ChangeLog:
2014-03-17 Will Newton <will.newton@linaro.org>
* argp/argp-fmtstream.h: Check whether
__STRICT_ANSI__ is defined with #ifdef rather
than #if.
* argp/argp.h: Likewise.
diff --git a/ChangeLog b/ChangeLog
index 4b33175..37d34f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * argp/argp-fmtstream.h: Check whether
+ __STRICT_ANSI__ is defined with #ifdef rather
+ than #if.
+ * argp/argp.h: Likewise.
+
* libio/genops.c: Check whether
_IO_JUMPS_OFFSET is defined with #ifdef rather
than #if.
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index a5a1019..1ed2834 100644
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -31,12 +31,14 @@
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
+ defined __STRICT_ANSI__
# define __attribute__(Spec) /* empty */
# endif
/* The __-protected variants of `format' and `printf' attributes
are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
+ defined __STRICT_ANSI__
# define __format__ format
# define __printf__ printf
# endif
diff --git a/argp/argp.h b/argp/argp.h
index 3845172..0868228 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -37,12 +37,14 @@
#ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || \
+ defined __STRICT_ANSI__
# define __attribute__(Spec) /* empty */
# endif
/* The __-protected variants of `format' and `printf' attributes
are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
+ defined __STRICT_ANSI__
# define __format__ format
# define __printf__ printf
# endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421
commit f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 10:54:12 2014 +0000
Fix _IO_JUMPS_OFFSET -Wundef warnings
ChangeLog:
2014-03-17 Will Newton <will.newton@linaro.org>
* libio/genops.c: Check whether
_IO_JUMPS_OFFSET is defined with #ifdef rather
than #if.
* libio/libioP.h: Likewise.
* stdio-common/vfprintf.c: Likewise.
diff --git a/ChangeLog b/ChangeLog
index af65c1d..4b33175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * libio/genops.c: Check whether
+ _IO_JUMPS_OFFSET is defined with #ifdef rather
+ than #if.
+ * libio/libioP.h: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+
* sysdeps/generic/ldsodefs.h: Check whether
HP_SMALL_TIMING_AVAIL is defined with #ifdef rather
than #if.
diff --git a/libio/genops.c b/libio/genops.c
index e0ce8cc..42efe58 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -624,7 +624,7 @@ _IO_old_init (fp, flags)
fp->_IO_save_end = NULL;
fp->_markers = NULL;
fp->_cur_column = 0;
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
fp->_vtable_offset = 0;
#endif
#ifdef _IO_MTSAFE_IO
diff --git a/libio/libioP.h b/libio/libioP.h
index 8a7b85b..a59e95d 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -106,7 +106,7 @@ extern "C" {
#define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable
#define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL)
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
# define _IO_JUMPS_FUNC(THIS) \
(*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \
+ (THIS)->_vtable_offset))
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index f7e5f61..70cdba4 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -2297,7 +2297,7 @@ buffered_vfprintf (_IO_FILE *s, const CHAR_T *format,
hp->_mode = -1;
#endif
hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS|_IO_USER_LOCK;
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
hp->_vtable_offset = 0;
#endif
#ifdef _IO_MTSAFE_IO
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=53f1bed39263541ef7f3d86f9701005524938016
commit 53f1bed39263541ef7f3d86f9701005524938016
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 10:44:13 2014 +0000
Fix HP_SMALL_TIMING_AVAIL -Wundef warnings
ChangeLog:
2014-03-17 Will Newton <will.newton@linaro.org>
* sysdeps/generic/ldsodefs.h: Check whether
HP_SMALL_TIMING_AVAIL is defined with #ifdef rather
than #if.
diff --git a/ChangeLog b/ChangeLog
index 502008c..af65c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * sysdeps/generic/ldsodefs.h: Check whether
+ HP_SMALL_TIMING_AVAIL is defined with #ifdef rather
+ than #if.
+
* nptl/sysdeps/pthread/pthread.h: Check
__PTHREAD_MUTEX_HAVE_ELISION is defined before testing
its value.
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 65cd709..d61b9f9 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -322,7 +322,7 @@ struct rtld_global
/* The object to be initialized first. */
EXTERN struct link_map *_dl_initfirst;
-#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL
+#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL
/* Start time on CPU clock. */
EXTERN hp_timing_t _dl_cpuclock_offset;
#endif
@@ -535,7 +535,7 @@ struct rtld_global_ro
/* All search directories defined at startup. */
EXTERN struct r_search_path_elem *_dl_init_all_dirs;
-#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL
+#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL
/* Overhead of a high-precision timing measurement. */
EXTERN hp_timing_t _dl_hp_timing_overhead;
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=788bba368c2eaf8aa3fd2ca18d269395d6bc8afb
commit 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 10:16:53 2014 +0000
Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning
ChangeLog:
2014-03-17 Will Newton <will.newton@linaro.org>
* nptl/sysdeps/pthread/pthread.h: Check
__PTHREAD_MUTEX_HAVE_ELISION is defined before testing
its value.
diff --git a/ChangeLog b/ChangeLog
index da6a230..502008c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-17 Will Newton <will.newton@linaro.org>
+
+ * nptl/sysdeps/pthread/pthread.h: Check
+ __PTHREAD_MUTEX_HAVE_ELISION is defined before testing
+ its value.
+
2014-03-17 Siddhesh Poyarekar <siddhesh@redhat.com>
* libio/iofdopen.c (_IO_new_fdopen): Seek to end only if
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 1e0c5dc..142da63 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -83,12 +83,16 @@ enum
/* Mutex initializers. */
-#if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout. */
-#define __PTHREAD_SPINS 0, 0
-#elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout. */
-#define __PTHREAD_SPINS { 0, 0 }
+#ifdef __PTHREAD_MUTEX_HAVE_ELISION
+# if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout. */
+# define __PTHREAD_SPINS 0, 0
+# elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout. */
+# define __PTHREAD_SPINS { 0, 0 }
+# else
+# error "Unknown value of __PTHREAD_MUTEX_HAVE_ELISION"
+# endif
#else
-#define __PTHREAD_SPINS 0
+# define __PTHREAD_SPINS 0
#endif
#ifdef __PTHREAD_MUTEX_HAVE_PREV
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 25 +++++++++++++++++++++++++
argp/argp-fmtstream.h | 6 ++++--
argp/argp.h | 6 ++++--
libio/genops.c | 2 +-
libio/libioP.h | 2 +-
nptl/sysdeps/pthread/pthread.h | 14 +++++++++-----
stdio-common/vfprintf.c | 2 +-
sysdeps/generic/ldsodefs.h | 4 ++--
sysdeps/generic/math_private.h | 2 +-
9 files changed, 48 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources