This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-581-gf6fdf53

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  f6fdf53382922f51569f9dae0a0552e780a88fd6 (commit)
      from  f5d71e140d9a5adfc7f6c190032d6bdaa3c3a171 (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=f6fdf53382922f51569f9dae0a0552e780a88fd6

commit f6fdf53382922f51569f9dae0a0552e780a88fd6
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Jun 13 14:41:58 2014 -0700

    Consolidate sparc clone, fork, and vfork implementations.
    
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Delete.
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S: Delete.
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Moved ...
    	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: ... here.
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Delete.
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S: Delete.
    	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Moved ...
    	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: ... here.
    	* sysdeps/unix/sysv/linux/sparc/fork.S: Delete.
    	* sysdeps/unix/sysv/linux/sparc/pt-vfork.S: New file.
    	* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__thread_start):
    	Remove RESET_PID cpp guards.
    	* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__thread_start):
    	Remove RESET_PID cpp guards.
    	* sysdeps/unix/sysv/linux/sparc/vfork.S: Delete.

diff --git a/ChangeLog b/ChangeLog
index ff239f8..39e94f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2014-06-13  David S. Miller  <davem@davemloft.net>
+
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Delete.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S: Delete.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Moved ...
+	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Delete.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S: Delete.
+	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Moved ...
+	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: ... here.
+	* sysdeps/unix/sysv/linux/sparc/fork.S: Delete.
+	* sysdeps/unix/sysv/linux/sparc/pt-vfork.S: New file.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__thread_start):
+	Remove RESET_PID cpp guards.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__thread_start):
+	Remove RESET_PID cpp guards.
+	* sysdeps/unix/sysv/linux/sparc/vfork.S: Delete.
+
 2014-06-13  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_UNWINDS, _jmpbuf_sp): Cast
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
-   So, #include ourselves and in that incarnation we can use #include_next.  */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S
deleted file mode 100644
index a17feca..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-#include <tcb-offsets.h>
-
-	.text
-	.globl		__syscall_error
-ENTRY(__vfork)
-	ld	[%g7 + PID], %o5
-	sub	%g0, %o5, %o4
-	st	%o4, [%g7 + PID]
-
-	LOADSYSCALL(vfork)
-	ta	0x10
-	bcc	2f
-	 mov	%o7, %g1
-	st	%o5, [%g7 + PID]
-	call	__syscall_error
-	 mov	%g1, %o7
-2:	sub	%o1, 1, %o1
-	andcc	%o0, %o1, %o0
-	bne,a	1f
-	 st	%o5, [%g7 + PID]
-1:	retl
-	 nop
-END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
-   So, #include ourselves and in that incarnation we can use #include_next.  */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S
deleted file mode 100644
index 0561bd2..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-#include <tcb-offsets.h>
-
-	.text
-	.globl	__syscall_error
-ENTRY(__vfork)
-	ld	[%g7 + PID], %o5
-	sub	%g0, %o5, %o4
-	st	%o4, [%g7 + PID]
-
-	LOADSYSCALL(vfork)
-	ta	0x6d
-	bcc,pt	%xcc, 2f
-	 mov	%o7, %g1
-	st	%o5, [%g7 + PID]
-	call	__syscall_error
-	 mov	%g1, %o7
-2:	sub	%o1, 1, %o1
-	andcc	%o0, %o1, %o0
-	bne,a,pt %icc, 1f
-	 st	%o5, [%g7 + PID]
-1:	retl
-	 nop
-END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/fork.S b/sysdeps/unix/sysv/linux/sparc/fork.S
deleted file mode 100644
index f3a83e6..0000000
--- a/sysdeps/unix/sysv/linux/sparc/fork.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-
-PSEUDO (__libc_fork, fork, 0)
-	sub	%o1, 1, %o1
-	retl
-	 and	%o0, %o1, %o0
-PSEUDO_END (__libc_fork)
-
-weak_alias (__libc_fork, __fork)
-libc_hidden_def (__fork)
-weak_alias (__libc_fork, fork)
diff --git a/sysdeps/unix/sysv/linux/sparc/pt-vfork.S b/sysdeps/unix/sysv/linux/sparc/pt-vfork.S
new file mode 100644
index 0000000..65cc382
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/pt-vfork.S
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
index e007d5d..66d34f3 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
@@ -80,7 +80,6 @@ END(__clone)
 
 	.type	__thread_start,@function
 __thread_start:
-#ifdef RESET_PID
 	sethi	%hi(CLONE_THREAD), %l0
 	andcc	%g4, %l0, %g0
 	bne	1f
@@ -93,7 +92,6 @@ __thread_start:
 	st	%o0,[%g7 + PID]
 	st	%o0,[%g7 + TID]
 1:
-#endif
 	mov	%g0, %fp	/* terminate backtrace */
 	call	%g2
 	 mov	%g3,%o0
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
similarity index 97%
rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
rename to sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
index 7ae59cf..549769a 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
@@ -46,3 +46,4 @@ END(__vfork)
 
 libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)
+strong_alias (__vfork, __libc_vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
index 57d75d2..87f944c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
@@ -77,7 +77,6 @@ END(__clone)
 
 	.type __thread_start,@function
 __thread_start:
-#ifdef RESET_PID
 	sethi	%hi(CLONE_THREAD), %l0
 	andcc	%g4, %l0, %g0
 	bne,pt	%icc, 1f
@@ -89,7 +88,6 @@ __thread_start:
 2:	st	%o0,[%g7 + PID]
 	st	%o0,[%g7 + TID]
 1:
-#endif
 	mov	%g0, %fp	/* terminate backtrace */
 	call	%g2
 	 mov	%g3,%o0
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
similarity index 97%
rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
rename to sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
index be6e269..6d0628b 100644
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
@@ -46,3 +46,4 @@ END(__vfork)
 
 libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)
+strong_alias (__vfork, __libc_vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/vfork.S b/sysdeps/unix/sysv/linux/sparc/vfork.S
deleted file mode 100644
index 09c073e..0000000
--- a/sysdeps/unix/sysv/linux/sparc/vfork.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1999-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sysdep.h>
-
-PSEUDO (__vfork, vfork, 0)
-	sub	%o1, 1, %o1
-	retl
-	 and	%o0, %o1, %o0
-
-PSEUDO_END (__vfork)
-libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)

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

Summary of changes:
 ChangeLog                                          |   18 ++++++++
 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S |    9 ----
 .../unix/sysv/linux/sparc/sparc32/pt-vfork.S       |   44 --------------------
 nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S |    9 ----
 .../unix/sysv/linux/sparc/sparc64/pt-vfork.S       |   44 --------------------
 sysdeps/unix/sysv/linux/sparc/fork.S               |   29 -------------
 sysdeps/unix/sysv/linux/{sh => sparc}/pt-vfork.S   |    0
 sysdeps/unix/sysv/linux/sparc/sparc32/clone.S      |    2 -
 .../unix/sysv/linux/sparc/sparc32/vfork.S          |    1 +
 sysdeps/unix/sysv/linux/sparc/sparc64/clone.S      |    2 -
 .../unix/sysv/linux/sparc/sparc64/vfork.S          |    1 +
 sysdeps/unix/sysv/linux/sparc/vfork.S              |   28 ------------
 12 files changed, 20 insertions(+), 167 deletions(-)
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/fork.S
 copy sysdeps/unix/sysv/linux/{sh => sparc}/pt-vfork.S (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc32/vfork.S (97%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/vfork.S (97%)
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/vfork.S


hooks/post-receive
-- 
GNU C Library master sources
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]