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-183-g04ec140
- From: willnewton at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Mar 2014 20:46:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-183-g04ec140
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 04ec140a2e250a616794285e19d481cf3fa4e790 (commit)
via 7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e (commit)
via c15cf13a8a672bd27bf3d94b995c52872eed537d (commit)
via d0ac132472b6e4ca9a6664d979724f700f8fb48a (commit)
from 9290130a8de3f30970f741c79dfe8459f798e05f (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=04ec140a2e250a616794285e19d481cf3fa4e790
commit 04ec140a2e250a616794285e19d481cf3fa4e790
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 20:40:33 2014 +0000
Revert "Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning"
This reverts commit 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb.
diff --git a/ChangeLog b/ChangeLog
index 77c55d5..d6d30e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * nptl/sysdeps/pthread/pthread.h: Revert previous
+ change.
+
* sysdeps/generic/ldsodefs.h: Revert previous
change.
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 142da63..1e0c5dc 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -83,16 +83,12 @@ enum
/* Mutex initializers. */
-#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
+#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
-# define __PTHREAD_SPINS 0
+#define __PTHREAD_SPINS 0
#endif
#ifdef __PTHREAD_MUTEX_HAVE_PREV
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e
commit 7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 20:39:24 2014 +0000
Revert "Fix HP_SMALL_TIMING_AVAIL -Wundef warnings"
This reverts commit 53f1bed39263541ef7f3d86f9701005524938016.
diff --git a/ChangeLog b/ChangeLog
index a679274..77c55d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * sysdeps/generic/ldsodefs.h: Revert previous
+ change.
+
* libio/genops.c: Revert previous change.
* libio/libioP.h: Likewise.
* stdio-common/vfprintf.c: Likewise.
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index d61b9f9..65cd709 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 || defined HP_SMALL_TIMING_AVAIL
+#if HP_TIMING_AVAIL || 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 || defined HP_SMALL_TIMING_AVAIL
+#if HP_TIMING_AVAIL || 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=c15cf13a8a672bd27bf3d94b995c52872eed537d
commit c15cf13a8a672bd27bf3d94b995c52872eed537d
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 20:37:42 2014 +0000
Revert "Fix _IO_JUMPS_OFFSET -Wundef warnings"
This reverts commit f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421.
diff --git a/ChangeLog b/ChangeLog
index 972c30b..a679274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * libio/genops.c: Revert previous change.
+ * libio/libioP.h: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+
* sysdeps/generic/math_private.h: Revert previous
change.
diff --git a/libio/genops.c b/libio/genops.c
index 42efe58..e0ce8cc 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;
-#ifdef _IO_JUMPS_OFFSET
+#if _IO_JUMPS_OFFSET
fp->_vtable_offset = 0;
#endif
#ifdef _IO_MTSAFE_IO
diff --git a/libio/libioP.h b/libio/libioP.h
index a59e95d..8a7b85b 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)
-#ifdef _IO_JUMPS_OFFSET
+#if _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 70cdba4..f7e5f61 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;
-#ifdef _IO_JUMPS_OFFSET
+#if _IO_JUMPS_OFFSET
hp->_vtable_offset = 0;
#endif
#ifdef _IO_MTSAFE_IO
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d0ac132472b6e4ca9a6664d979724f700f8fb48a
commit d0ac132472b6e4ca9a6664d979724f700f8fb48a
Author: Will Newton <will.newton@linaro.org>
Date: Mon Mar 17 20:36:06 2014 +0000
Revert "Fix HAVE_RM_CTX -Wundef warnings"
This reverts commit 9290130a8de3f30970f741c79dfe8459f798e05f.
diff --git a/ChangeLog b/ChangeLog
index f6b90d2..972c30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-03-17 Will Newton <will.newton@linaro.org>
+ * sysdeps/generic/math_private.h: Revert previous
+ change.
+
* sysdeps/generic/math_private.h: Check whether
HAVE_RM_CTX is defined with #ifdef rather
than #if.
diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 0ac70e3..9b881a3 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
-#ifdef HAVE_RM_CTX
+#if 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
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 +-
7 files changed, 24 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources