GNU C Library master sources branch master updated. glibc-2.26-150-g4504783

[fw at sourceware dot org]

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  4504783c0f65b7074204c6126c6255ed89d6594e (commit)
      from  b5889d25e9bf944a89fdd7bcabf3b6c6f6bb6f7c (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=4504783c0f65b7074204c6126c6255ed89d6594e

commit 4504783c0f65b7074204c6126c6255ed89d6594e
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Aug 21 19:28:54 2017 +0200

    benchtests: Do not compile benchmark objects as libc modules [BZ #21864]
    
    Otherwise, this will lead to link failures due to hidden symbol
    references.

diff --git a/ChangeLog b/ChangeLog
index bfc20d6..768f235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-08-21  Florian Weimer  <fweimer@redhat.com>
 
+	[BZ #21864]
+	Do not compile benchmark helper objects with -DMODULE_NAME=libc.
+	* benchtests/Makefile (others-extras): Set to $(bench-extra-objs).
+	Move before inclusion of ../Rules.
+
+2017-08-21  Florian Weimer  <fweimer@redhat.com>
+
 	[BZ #21972]
 	* assert/assert.h (assert): Use static_cast (bool) for C++.
 	Use the ternary operator in the warning branch for GNU C.
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 37788e8..a0c3470 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -93,6 +93,11 @@ $(objpfx)bench-malloc-thread: $(shared-thread-library)
 # affect their performance.
 .NOTPARALLEL:
 
+bench-extra-objs = json-lib.o
+
+extra-objs += $(bench-extra-objs)
+others-extras = $(bench-extra-objs)
+
 include ../Rules
 
 binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
@@ -125,10 +130,6 @@ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
 lib := nonlib
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
-bench-extra-objs = json-lib.o
-
-extra-objs += $(bench-extra-objs)
-
 bench-deps := bench-skeleton.c bench-timing.h Makefile
 
 run-bench = $(test-wrapper-env) \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    7 +++++++
 benchtests/Makefile |    9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources