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-476-g15eaf6f
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 May 2014 07:30:17 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-476-g15eaf6f
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 15eaf6ffe3e117684a0e7b070c0a8754480d3fa3 (commit)
via 75f11331f98ebf3873e887a683add944a1aec0fd (commit)
from c3ec475c5dd16499aa040908e11d382c3ded9692 (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=15eaf6ffe3e117684a0e7b070c0a8754480d3fa3
commit 15eaf6ffe3e117684a0e7b070c0a8754480d3fa3
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat Feb 22 10:09:27 2014 +0530
benchtests: Add new directive for benchmark initialization hook
Add a new 'init' directive that specifies the name of the function to
call to do function-specific initialization. This is useful for
benchmarks that need to do a one-time initialization before the
functions are executed.
diff --git a/ChangeLog b/ChangeLog
index 0adb1a9..027464d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-26 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * benchtests/README: Document 'init' directive.
+ * benchtests/bench-skeleton.c (main) [BENCH_INIT]: Call
+ BENCH_INIT.
+ * scripts/bench.py (gen_source): Define BENCH_INIT macro.
+ (parse_file): Recognize 'init' directive.
+
2014-05-26 Kyle McMartin <kyle@redhat.com>
[BZ #16796]
diff --git a/benchtests/README b/benchtests/README
index 52a3cc2..999d268 100644
--- a/benchtests/README
+++ b/benchtests/README
@@ -62,6 +62,7 @@ one to add `foo' to the bench tests:
and functions (specifically, this includes using "#include "source").
See pthread_once-inputs and pthreads_once-source.c for an example of how
to use this to benchmark a function that needs state across several calls.
+ - init: Name of an initializer function to call to initialize the benchtest.
- name: See following section for instructions on how to use this directive.
Lines beginning with a single hash '#' are treated as comments. See
diff --git a/benchtests/bench-skeleton.c b/benchtests/bench-skeleton.c
index 29d6bda..68a91dc 100644
--- a/benchtests/bench-skeleton.c
+++ b/benchtests/bench-skeleton.c
@@ -62,6 +62,9 @@ main (int argc, char **argv)
unsigned long iters, res;
+#ifdef BENCH_INIT
+ BENCH_INIT ();
+#endif
TIMING_INIT (res);
iters = 1000 * res;
diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
index 492c764..eb5a141 100755
--- a/benchtests/scripts/bench.py
+++ b/benchtests/scripts/bench.py
@@ -128,6 +128,10 @@ def gen_source(func, directives, all_vals):
else:
getret = ''
+ # Test initialization.
+ if directives['init']:
+ print('#define BENCH_INIT %s' % directives['init'])
+
print(EPILOGUE % {'getret': getret, 'func': func})
@@ -232,7 +236,8 @@ def parse_file(func):
'args': [],
'includes': [],
'include-sources': [],
- 'ret': ''
+ 'ret': '',
+ 'init': ''
}
try:
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=75f11331f98ebf3873e887a683add944a1aec0fd
commit 75f11331f98ebf3873e887a683add944a1aec0fd
Author: Kyle McMartin <kmcmarti@redhat.com>
Date: Mon May 26 12:33:22 2014 +0530
[AARCH64] correct alignment of TLS_TCB_ALIGN (BZ #16796)
This fixes a variety of testsuite failures for me:
tststatic.out Error 1
tststatic2.out Error 1
tst-tls9-static.out Error 1
tst-audit8.out Error 127
tst-audit9.out Error 127
tst-audit1.out Error 127
and also has the added benefit of making LD_AUDIT/sotruss work on
AArch64.
Otherwise, we bail out early in _dl_try_allocate_static_tls as the
alignment requirement of the PT_TLS section in libc is 16.
diff --git a/ChangeLog b/ChangeLog
index 99d6223..0adb1a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-26 Kyle McMartin <kyle@redhat.com>
+
+ [BZ #16796]
+ * sysdeps/aarch64/nptl/tls.h: increase TCB alignment to the
+ alignment of struct pthread.
+
2014-05-26 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #16878]
diff --git a/NEWS b/NEWS
index eaf0bc0..35914ea 100644
--- a/NEWS
+++ b/NEWS
@@ -15,10 +15,10 @@ Version 2.20
16613, 16619, 16623, 16629, 16632, 16634, 16639, 16642, 16648, 16649,
16670, 16674, 16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707,
16712, 16713, 16714, 16731, 16739, 16740, 16743, 16754, 16758, 16759,
- 16760, 16770, 16786, 16789, 16791, 16799, 16800, 16815, 16823, 16824,
- 16831, 16838, 16849, 16854, 16876, 16877, 16878, 16885, 16888, 16890,
- 16912, 16915, 16916, 16917, 16922, 16927, 16928, 16932, 16943, 16958,
- 16966, 16967, 16965, 16977, 16978.
+ 16760, 16770, 16786, 16789, 16791, 16796, 16799, 16800, 16815, 16823,
+ 16824, 16831, 16838, 16849, 16854, 16876, 16877, 16878, 16885, 16888,
+ 16890, 16912, 16915, 16916, 16917, 16922, 16927, 16928, 16932, 16943,
+ 16958, 16966, 16967, 16965, 16977, 16978.
* The minimum Linux kernel version that this version of the GNU C Library
can be used with is 2.6.32.
diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h
index ae2e6c4..8b260a1 100644
--- a/sysdeps/aarch64/nptl/tls.h
+++ b/sysdeps/aarch64/nptl/tls.h
@@ -63,7 +63,7 @@ typedef struct
# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
/* Alignment requirements for the initial TCB. */
-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
+# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
/* This is the size of the TCB. */
# define TLS_TCB_SIZE sizeof (tcbhead_t)
@@ -72,7 +72,7 @@ typedef struct
# define TLS_PRE_TCB_SIZE sizeof (struct pthread)
/* Alignment requirements for the TCB. */
-# define TLS_TCB_ALIGN __alignof__ (tcbhead_t)
+# define TLS_TCB_ALIGN __alignof__ (struct pthread)
/* Install the dtv pointer. The pointer passed is to the element with
index -1 which contain the length. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++++++++++++
NEWS | 8 ++++----
benchtests/README | 1 +
benchtests/bench-skeleton.c | 3 +++
benchtests/scripts/bench.py | 7 ++++++-
sysdeps/aarch64/nptl/tls.h | 4 ++--
6 files changed, 30 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources