GNU C Library master sources branch master updated. glibc-2.22-25-gedd4cbc

[sthibaul 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  edd4cbcf83fb466dd8a1b5d63d55b1fea96356fe (commit)
      from  5e29dd573777197fc4d12c1bdea8f6d04e505391 (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=edd4cbcf83fb466dd8a1b5d63d55b1fea96356fe

commit edd4cbcf83fb466dd8a1b5d63d55b1fea96356fe
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Fri Aug 7 01:38:39 2015 +0200

    Fix gcrt0.o compilation
    
    When static-start-installed-name is different from
    start-installed-name, we must not use the shared objects.
    
    * csu/Makefile
    (extra-objs): Add gmon-start.o when building shared library and
    $(static-start-installed-name) is different from
    $(start-installed-name).
    $(objpfx)g$(static-start-installed-name): When building shared
    library and $(static-start-installed-name) is different from
    $(static-start-installed-name), revert to non-shared rule,
    i.e. using $(objpfx)% and gmon-start.o.

diff --git a/ChangeLog b/ChangeLog
index f3456ba..1994e44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-08-07  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	Fix gcrt0.o compilation
+
+	When static-start-installed-name is different from
+	start-installed-name, we must not use the shared objects.
+
+	* csu/Makefile
+	(extra-objs): Add gmon-start.o when building shared library and
+	$(static-start-installed-name) is different from
+	$(start-installed-name).
+	$(objpfx)g$(static-start-installed-name): When building shared
+	library and $(static-start-installed-name) is different from
+	$(static-start-installed-name), revert to non-shared rule,
+	i.e. using $(objpfx)% and gmon-start.o.
+
 2015-08-06  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #16519]
diff --git a/csu/Makefile b/csu/Makefile
index 9f0855a..4df5d10 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -47,6 +47,9 @@ tests-static := tst-empty
 
 ifeq (yes,$(build-shared))
 extra-objs += S$(start-installed-name) gmon-start.os
+ifneq ($(start-installed-name),$(static-start-installed-name))
+extra-objs += gmon-start.o
+endif
 install-lib += S$(start-installed-name)
 generated += start.os
 else
@@ -98,10 +101,14 @@ endif
 # startfile with gmon-start.o, which defines a constructor function
 # to turn on profiling code at startup.
 ifeq (yes,$(build-shared))
-$(addprefix $(objpfx),$(sort g$(start-installed-name) \
-			     g$(static-start-installed-name))): \
+$(objpfx)g$(start-installed-name): \
   $(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os
 	$(link-relocatable)
+ifneq ($(start-installed-name),$(static-start-installed-name))
+$(objpfx)g$(static-start-installed-name): \
+  $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o
+	$(link-relocatable)
+endif
 else
 $(addprefix $(objpfx),$(sort g$(start-installed-name) \
 			     g$(static-start-installed-name))): \

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

Summary of changes:
 ChangeLog    |   16 ++++++++++++++++
 csu/Makefile |   11 +++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)


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