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 roland/nptl-ia64 created. glibc-2.19-781-g51fec09

From: roland at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 7 Jul 2014 16:43:29 -0000
Subject: GNU C Library master sources branch roland/nptl-ia64 created. glibc-2.19-781-g51fec09
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, roland/nptl-ia64 has been created
        at  51fec0914c500e7ed7f8540feace71102b05dd97 (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=51fec0914c500e7ed7f8540feace71102b05dd97

commit 51fec0914c500e7ed7f8540feace71102b05dd97
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 22:19:41 2014 -0700

    IA64: Consolidate nptl/ subdirectories under linux/...

diff --git a/ChangeLog b/ChangeLog
index ef1708f..807c1f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,69 @@
 2014-07-03  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/ia64/nptl/Makefile: File removed, contents
+	appended ...
+	* sysdeps/unix/sysv/linux/ia64/Makefile: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/Versions: File removed, contents
+	appended ...
+	* sysdeps/unix/sysv/linux/ia64/Versions: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/__ia64_longjmp.S: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/__ia64_longjmp.S: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/__sigstack_longjmp.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/__sigstack_longjmp.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/c++-types.data: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/ld.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/ld.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libBrokenLocale.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libBrokenLocale.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libanl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libanl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libc.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libcrypt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libdl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libdl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libm.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libm.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libnsl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libnsl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libpthread.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libresolv.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libresolv.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/librt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/librt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libthread_db.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libthread_db.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/libutil.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/libutil.abilist: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/localplt.data: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/localplt.data: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/timer_create.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/timer_create.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/timer_delete.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/timer_delete.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/timer_getoverr.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/timer_getoverr.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/timer_gettime.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/timer_gettime.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/timer_settime.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/timer_settime.c: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c: ... here.
+	Update #include.
+	* sysdeps/unix/sysv/linux/ia64/nptl/unwind_longjmp.c: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c: ... here.
+
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/unix/sysv/linux/ia64/nptl/vfork.S: Moved ...
 	* sysdeps/unix/sysv/linux/ia64/vfork.S: ... here.
 	(__libc_vfork): Define function under this name.
diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index bbfd6a2..f1049c3 100644
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -26,3 +26,7 @@ endif
 # This is a crude attempt to silence the compiler which complains about
 # then 'current' definition in the kernel headers.
 CPPFLAGS += -D_ASM_IA64_CURRENT_H
+
+ifeq ($(subdir),nptl)
+libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
+endif
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions
index 13d710a..b38d6ef 100644
--- a/sysdeps/unix/sysv/linux/ia64/Versions
+++ b/sysdeps/unix/sysv/linux/ia64/Versions
@@ -23,3 +23,16 @@ libc {
     getunwind;
   }
 }
+libpthread {
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack; pthread_attr_setstacksize;
+  }
+}
+librt {
+  GLIBC_2.3.3 {
+    # Changed timer_t.
+    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    timer_settime;
+  }
+}
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/__ia64_longjmp.S b/sysdeps/unix/sysv/linux/ia64/__ia64_longjmp.S
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/__ia64_longjmp.S
rename to sysdeps/unix/sysv/linux/ia64/__ia64_longjmp.S
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/__sigstack_longjmp.c b/sysdeps/unix/sysv/linux/ia64/__sigstack_longjmp.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/__sigstack_longjmp.c
rename to sysdeps/unix/sysv/linux/ia64/__sigstack_longjmp.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/ia64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/ia64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
rename to sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/ia64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/ia64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/ia64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/ia64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/ia64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/ia64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/ia64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/ia64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/ia64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/ia64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/ia64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/ia64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/ia64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/ia64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/ia64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/ia64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/ia64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/ia64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/ia64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/ia64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/ia64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/ia64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/localplt.data b/sysdeps/unix/sysv/linux/ia64/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/ia64/localplt.data
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/ia64/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/Makefile b/sysdeps/unix/sysv/linux/ia64/nptl/Makefile
deleted file mode 100644
index ff98f1a..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
-endif
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/Versions b/sysdeps/unix/sysv/linux/ia64/nptl/Versions
deleted file mode 100644
index 437c4da..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/Versions
+++ /dev/null
@@ -1,13 +0,0 @@
-libpthread {
-  GLIBC_2.3.3 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
-}
-librt {
-  GLIBC_2.3.3 {
-    # Changed timer_t.
-    timer_create; timer_delete; timer_getoverrun; timer_gettime;
-    timer_settime;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_create.c b/sysdeps/unix/sysv/linux/ia64/timer_create.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/timer_create.c
rename to sysdeps/unix/sysv/linux/ia64/timer_create.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_delete.c b/sysdeps/unix/sysv/linux/ia64/timer_delete.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/timer_delete.c
rename to sysdeps/unix/sysv/linux/ia64/timer_delete.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_getoverr.c b/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/timer_getoverr.c
rename to sysdeps/unix/sysv/linux/ia64/timer_getoverr.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_gettime.c b/sysdeps/unix/sysv/linux/ia64/timer_gettime.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/timer_gettime.c
rename to sysdeps/unix/sysv/linux/ia64/timer_gettime.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_settime.c b/sysdeps/unix/sysv/linux/ia64/timer_settime.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/timer_settime.c
rename to sysdeps/unix/sysv/linux/ia64/timer_settime.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
similarity index 96%
rename from sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c
rename to sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
index dd52294..8bc2e97 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c
+++ b/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
@@ -26,7 +26,7 @@ static _Unwind_Word (*libgcc_s_getbsp) (struct _Unwind_Context *);
 #define ARCH_CANCEL_INIT(handle) \
   ((libgcc_s_getbsp = __libc_dlsym (handle, "_Unwind_GetBSP")) == NULL)
 
-#include <sysdeps/pthread/unwind-forcedunwind.c>
+#include <sysdeps/nptl/unwind-forcedunwind.c>
 
 _Unwind_Word
 _Unwind_GetBSP (struct _Unwind_Context *context)
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/unwind_longjmp.c b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/unwind_longjmp.c
rename to sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0a5c19623511f84b9c73cd5f0e4d0f7b6a9eda0c

commit 0a5c19623511f84b9c73cd5f0e4d0f7b6a9eda0c
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 22:09:33 2014 -0700

    IA64: Consolidate NPTL/non versions of vfork

diff --git a/ChangeLog b/ChangeLog
index 69b8ad6..ef1708f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2014-07-03  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/ia64/nptl/vfork.S: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/vfork.S: ... here.
+	(__libc_vfork): Define function under this name.
+	(__vfork): Define as an alias.
+	* sysdeps/unix/sysv/linux/ia64/pt-vfork.S: New file.
+	* sysdeps/unix/sysv/linux/ia64/nptl/pt-vfork.S: File removed.
+
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h: Moved ...
 	* sysdeps/ia64/nptl/bits/pthreadtypes.h: ... here.
 	* sysdeps/unix/sysv/linux/ia64/nptl/bits/semaphore.h: Moved ...
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/ia64/nptl/pt-vfork.S
deleted file mode 100644
index 59b5b7a..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/pt-vfork.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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>
-#define _SIGNAL_H
-#include <bits/signum.h>
-#include <tcb-offsets.h>
-
-/* The following are defined in linux/sched.h, which unfortunately	*/
-/* is not safe for inclusion in an assembly file.			*/
-#define CLONE_VM        0x00000100      /* set if VM shared between processes */
-#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
-
-/* pid_t vfork(void); */
-/* Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0)	*/
-
-ENTRY(__vfork)
-	.prologue	// work around a GAS bug which triggers if
-	.body		// first .prologue is not at the beginning of proc.
-	alloc r2=ar.pfs,0,0,2,0
-	adds r14=PID,r13
-	;;
-	ld4 r16=[r14]
-	;;
-	sub r15=0,r16
-	mov out0=CLONE_VM+CLONE_VFORK+SIGCHLD
-	mov out1=0		/* Standard sp value.			*/
-	;;
-	st4 [r14]=r15
-	DO_CALL (SYS_ify (clone))
-	cmp.eq p0,p7=0,r8
-	adds r14=PID,r13
-	;;
-(p7)	ld4 r16=[r14]
-	cmp.eq p6,p0=-1,r10
-	;;
-(p7)	sub r15=0,r16
-	;;
-(p7)	st4 [r14]=r15
-(p6)	br.cond.spnt.few __syscall_error
-	ret
-PSEUDO_END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/vfork.S b/sysdeps/unix/sysv/linux/ia64/nptl/vfork.S
deleted file mode 100644
index f1ca305..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/vfork.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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>
-#define _SIGNAL_H
-#include <bits/signum.h>
-#include <tcb-offsets.h>
-
-/* The following are defined in linux/sched.h, which unfortunately	*/
-/* is not safe for inclusion in an assembly file.			*/
-#define CLONE_VM        0x00000100      /* set if VM shared between processes */
-#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
-
-/* pid_t vfork(void); */
-/* Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0)	*/
-
-ENTRY(__vfork)
-	.prologue	// work around a GAS bug which triggers if
-	.body		// first .prologue is not at the beginning of proc.
-	alloc r2=ar.pfs,0,0,2,0
-	adds r14=PID,r13
-	;;
-	ld4 r16=[r14]
-	;;
-	sub r15=0,r16
-	cmp.eq p6,p0=0,r16
-	;;
-(p6)	movl r15=0x80000000
-	mov out0=CLONE_VM+CLONE_VFORK+SIGCHLD
-	mov out1=0		/* Standard sp value.			*/
-	;;
-	st4 [r14]=r15
-	DO_CALL (SYS_ify (clone))
-	cmp.eq p6,p0=0,r8
-	adds r14=PID,r13
-(p6)	br.cond.dptk 1f
-	;;
-	ld4 r15=[r14]
-	;;
-	extr.u r16=r15,0,31
-	;;
-	cmp.eq p0,p6=0,r16
-	;;
-(p6)	sub r16=0,r15
-	;;
-	st4 [r14]=r16
-1:
-	cmp.eq p6,p0=-1,r10
-(p6)	br.cond.spnt.few __syscall_error
-	ret
-PSEUDO_END(__vfork)
-libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/ia64/pt-vfork.S b/sysdeps/unix/sysv/linux/ia64/pt-vfork.S
new file mode 100644
index 0000000..792df30
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/pt-vfork.S
@@ -0,0 +1,47 @@
+/* vfork ABI-compatibility entry points for libpthread.  IA64 version.
+   Copyright (C) 2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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 <shlib-compat.h>
+
+/* libpthread used to have its own vfork implementation that differed
+   from libc's only in having a pointless micro-optimization.  There
+   is no longer any use to having a separate copy in libpthread, but
+   the historical ABI requires it.  For static linking, there is no
+   need to provide anything here--the libc version will be linked in.
+   For shared library ABI compatibility, there must be __vfork and
+   vfork symbols in libpthread.so.  */
+
+#if (SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20) \
+     || SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20))
+
+LOCAL_LEAF (vfork_compat)
+	br __libc_vfork
+	;;
+END (vfork_compat)
+
+#endif
+
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)
+compat_symbol (libpthread, vfork_compat, vfork, GLIBC_2_0);
+#endif
+
+#if SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20)
+strong_alias (vfork_compat, __vfork_compat)
+compat_symbol (libpthread, __vfork_compat, __vfork, GLIBC_2_1_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/ia64/vfork.S b/sysdeps/unix/sysv/linux/ia64/vfork.S
index 0422104..ff2d22b 100644
--- a/sysdeps/unix/sysv/linux/ia64/vfork.S
+++ b/sysdeps/unix/sysv/linux/ia64/vfork.S
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 #define _SIGNAL_H
 #include <bits/signum.h>
+#include <tcb-offsets.h>
 
 /* The following are defined in linux/sched.h, which unfortunately	*/
 /* is not safe for inclusion in an assembly file.			*/
@@ -28,16 +29,42 @@
 /* pid_t vfork(void); */
 /* Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0)	*/
 
-ENTRY(__vfork)
+ENTRY (__libc_vfork)
+	.prologue	// work around a GAS bug which triggers if
+	.body		// first .prologue is not at the beginning of proc.
 	alloc r2=ar.pfs,0,0,2,0
+	adds r14=PID,r13
+	;;
+	ld4 r16=[r14]
+	;;
+	sub r15=0,r16
+	cmp.eq p6,p0=0,r16
+	;;
+(p6)	movl r15=0x80000000
 	mov out0=CLONE_VM+CLONE_VFORK+SIGCHLD
 	mov out1=0		/* Standard sp value.			*/
 	;;
-	DO_CALL_VIA_BREAK (SYS_ify (clone))
+	st4 [r14]=r15
+	DO_CALL (SYS_ify (clone))
+	cmp.eq p6,p0=0,r8
+	adds r14=PID,r13
+(p6)	br.cond.dptk 1f
+	;;
+	ld4 r15=[r14]
+	;;
+	extr.u r16=r15,0,31
+	;;
+	cmp.eq p0,p6=0,r16
+	;;
+(p6)	sub r16=0,r15
+	;;
+	st4 [r14]=r16
+1:
 	cmp.eq p6,p0=-1,r10
 (p6)	br.cond.spnt.few __syscall_error
 	ret
-PSEUDO_END(__vfork)
-libc_hidden_def (__vfork)
+PSEUDO_END (__libc_vfork)
 
+strong_alias (__libc_vfork, __vfork)
+libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c3c9b5a4b7852b25a81ef52b7da7063d83dc033f

commit c3c9b5a4b7852b25a81ef52b7da7063d83dc033f
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 21:51:13 2014 -0700

    IA64: Move NPTL public headers to sysdeps/ia64/nptl/.

diff --git a/ChangeLog b/ChangeLog
index 3d6edb5..69b8ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2014-07-03  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h: Moved ...
+	* sysdeps/ia64/nptl/bits/pthreadtypes.h: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/bits/semaphore.h: Moved ...
+	* sysdeps/ia64/nptl/bits/semaphore.h: ... here.
+	* sysdeps/unix/sysv/linux/ia64/nptl/bits/local_lim.h: Moved ...
+	* sysdeps/unix/sysv/linux/ia64/bits/local_lim.h: ... here.
+
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
 	* nptl/sysdeps/pthread/createthread.c: Include <arch-fork.h>.
 	* sysdeps/unix/sysv/linux/ia64/arch-fork.h (ARCH_CLONE): New macro.
 	* sysdeps/ia64/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h b/sysdeps/ia64/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h
rename to sysdeps/ia64/nptl/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/bits/semaphore.h b/sysdeps/ia64/nptl/bits/semaphore.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/bits/semaphore.h
rename to sysdeps/ia64/nptl/bits/semaphore.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/bits/local_lim.h b/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/ia64/nptl/bits/local_lim.h
rename to sysdeps/unix/sysv/linux/ia64/bits/local_lim.h

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c02ea4d71c85b976e4f569859bea9bcf75a98cee

commit c02ea4d71c85b976e4f569859bea9bcf75a98cee
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 21:51:01 2014 -0700

    IA64: Define TLS_DEFINE_INIT_TP

diff --git a/ChangeLog b/ChangeLog
index 4eef2b3..3d6edb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-07-03  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/pthread/createthread.c: Include <arch-fork.h>.
+	* sysdeps/unix/sysv/linux/ia64/arch-fork.h (ARCH_CLONE): New macro.
+	* sysdeps/ia64/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
+	* sysdeps/unix/sysv/linux/ia64/nptl/createthread.c: File removed.
+
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/unix/sysv/linux/ia64/clone2.S: Deconditionalize the code
 	that was previously under [RESET_PID].
 	* sysdeps/unix/sysv/linux/ia64/nptl/clone2.S: File removed.
diff --git a/nptl/createthread.c b/nptl/createthread.c
index d71467f..e718e35 100644
--- a/nptl/createthread.c
+++ b/nptl/createthread.c
@@ -25,6 +25,8 @@
 #include <tls.h>
 #include <stdint.h>
 
+#include <arch-fork.h>
+
 
 #define CLONE_SIGNAL		(CLONE_SIGHAND | CLONE_THREAD)
 
diff --git a/sysdeps/ia64/nptl/tls.h b/sysdeps/ia64/nptl/tls.h
index 3eca4e6..e38352a 100644
--- a/sysdeps/ia64/nptl/tls.h
+++ b/sysdeps/ia64/nptl/tls.h
@@ -121,6 +121,10 @@ register struct pthread *__thread_self __asm__("r13");
 # define TLS_INIT_TP(thrdescr) \
   (__thread_self = (thrdescr), INIT_SYSINFO, NULL)
 
+/* Value passed to 'clone2' for initialization of the thread register.  */
+# define TLS_DEFINE_INIT_TP(tp, pd) \
+  void *tp = (char *) (pd) + TLS_PRE_TCB_SIZE
+
 /* Return the address of the dtv for the current thread.  */
 #  define THREAD_DTV() \
   (((tcbhead_t *)__thread_self)->dtv)
diff --git a/sysdeps/unix/sysv/linux/ia64/arch-fork.h b/sysdeps/unix/sysv/linux/ia64/arch-fork.h
index 0562d93..ab2ffd1 100644
--- a/sysdeps/unix/sysv/linux/ia64/arch-fork.h
+++ b/sysdeps/unix/sysv/linux/ia64/arch-fork.h
@@ -27,3 +27,5 @@
   INLINE_SYSCALL (clone2, 6,						      \
 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	      \
 		  NULL, 0, NULL, &THREAD_SELF->tid, NULL)
+
+#define ARCH_CLONE __clone2
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/createthread.c b/sysdeps/unix/sysv/linux/ia64/nptl/createthread.c
deleted file mode 100644
index a2d5dec..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/createthread.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>.
-
-   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/>.  */
-
-/* Value passed to 'clone' for initialization of the thread register.  */
-#define TLS_VALUE ((char *) pd + TLS_PRE_TCB_SIZE)
-
-#define ARCH_CLONE __clone2
-
-/* Get the real implementation.	 */
-#include <nptl/sysdeps/pthread/createthread.c>

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a09399bd818625605850ff9c26d1e6cd919bbe85

commit a09399bd818625605850ff9c26d1e6cd919bbe85
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 21:50:50 2014 -0700

    IA64: Consolidate NPTL/non versions of clone

diff --git a/ChangeLog b/ChangeLog
index 5b31532..4eef2b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/ia64/clone2.S: Deconditionalize the code
+	that was previously under [RESET_PID].
+	* sysdeps/unix/sysv/linux/ia64/nptl/clone2.S: File removed.
+
 2014-07-07  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/nptl/lowlevellock.h: File removed.
diff --git a/sysdeps/unix/sysv/linux/ia64/clone2.S b/sysdeps/unix/sysv/linux/ia64/clone2.S
index 6198018..1490a46 100644
--- a/sysdeps/unix/sysv/linux/ia64/clone2.S
+++ b/sysdeps/unix/sysv/linux/ia64/clone2.S
@@ -67,7 +67,6 @@ ENTRY(__clone2)
 (CHILD)	mov loc0=gp
 (PARENT) ret
 	;;
-#ifdef RESET_PID
 	tbit.nz p6,p0=in3,16	/* CLONE_THREAD */
 	tbit.z p7,p10=in3,8	/* CLONE_VM */
 (p6)	br.cond.dptk 1f
@@ -82,7 +81,6 @@ ENTRY(__clone2)
 	st4 [r9]=r8
 	st4 [r10]=r8
 	;;
-#endif
 1:	ld8 out1=[in0],8	/* Retrieve code pointer.	*/
 	mov out0=in4		/* Pass proper argument	to fn */
 	;;
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/clone2.S b/sysdeps/unix/sysv/linux/ia64/nptl/clone2.S
deleted file mode 100644
index 91f28ba..0000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/clone2.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 <clone2.S>
-#else
-# define RESET_PID
-# include_next <clone2.S>
-#endif

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


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]