GNU C Library master sources branch master updated. glibc-2.23-491-g43c2948

[aurel32 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  43c2948756bb6e144c7b871e827bba37d61ad3a3 (commit)
      from  41a359e22f3a85a570bd5fd94496d02959fe8394 (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=43c2948756bb6e144c7b871e827bba37d61ad3a3

commit 43c2948756bb6e144c7b871e827bba37d61ad3a3
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Jun 18 19:11:23 2016 +0200

    MIPS, SPARC: fix wrong vfork aliases in libpthread.so
    
    With recent binutils versions the GNU libc fails to build on at least
    MISP and SPARC, with this kind of error:
    
      /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0'
      /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here
    
    It appears that on these architectures pt-vfork.S includes vfork.S
    (through the alpha version of pt-vfork.S) and that the __vfork aliases
    are not conditionalized on IS_IN (libc) like on other architectures.
    Therefore the aliases are also wrongly included in libpthread.so.
    
    Fix this by properly conditionalizing the aliases like on other
    architectures.
    
    Changelog:
    	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize
    	hidden_def, weak_alias and strong_alias on [IS_IN (libc)].
    	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
    	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index e72ffb8..af3dd66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-18  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize
+	hidden_def, weak_alias and strong_alias on [IS_IN (libc)].
+	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
+
 2016-06-16  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* NEWS: Mention addition of nextup and nextdown.
diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
index 8c66151..c0c0ce6 100644
--- a/sysdeps/unix/sysv/linux/mips/vfork.S
+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
@@ -106,6 +106,8 @@ L(error):
 #endif
 	END(__vfork)
 
+#if IS_IN (libc)
 libc_hidden_def(__vfork)
 weak_alias (__vfork, vfork)
 strong_alias (__vfork, __libc_vfork)
+#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
index dc32e0a..94f2c8d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
@@ -44,6 +44,8 @@ ENTRY(__vfork)
 	 nop
 END(__vfork)
 
+#if IS_IN (libc)
 libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)
 strong_alias (__vfork, __libc_vfork)
+#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
index 05be3c2..a7479e9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
@@ -44,6 +44,8 @@ ENTRY(__vfork)
 	 nop
 END(__vfork)
 
+#if IS_IN (libc)
 libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)
 strong_alias (__vfork, __libc_vfork)
+#endif

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

Summary of changes:
 ChangeLog                                     |    7 +++++++
 sysdeps/unix/sysv/linux/mips/vfork.S          |    2 ++
 sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S |    2 ++
 sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S |    2 ++
 4 files changed, 13 insertions(+), 0 deletions(-)


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