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-692-gd8a483f


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  d8a483f3ef9aaa9d4d4e5b72af586a44ae2daac3 (commit)
       via  52ae23b4bfa09fa1f42e3f659aaa057d1176d06b (commit)
       via  39507e4a6c52d67780d194dae8cfb636e2dbb87e (commit)
       via  e549ee56584d0c25e1f9dfcb6b05947fb3950447 (commit)
      from  6ad2df0bda76b97b9953f674877b672f1ee99030 (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=d8a483f3ef9aaa9d4d4e5b72af586a44ae2daac3

commit d8a483f3ef9aaa9d4d4e5b72af586a44ae2daac3
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jun 26 09:34:34 2014 -0700

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

diff --git a/ChangeLog b/ChangeLog
index ae25794..98b0eb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,75 @@
 2014-06-26  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist:
+	... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/libanl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist:
+	Identical file removed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data: Moved ...
+	* sysdeps/unix/sysv/linux/s390/localplt.data: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data:
+	Identical file removed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist:
+	... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist:
+	Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist: ... here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist: ... here.
+
 	* nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
 	folded into ...
 	* sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/s390/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/s390/localplt.data
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist
deleted file mode 100644
index c9755d8..0000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist
+++ /dev/null
@@ -1,6 +0,0 @@
-GLIBC_2.2.3
- GLIBC_2.2.3 A
- gai_cancel F
- gai_error F
- gai_suspend F
- getaddrinfo_a F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
deleted file mode 100644
index 8fb56b6..0000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
+++ /dev/null
@@ -1,7 +0,0 @@
-libc.so: _Unwind_Find_FDE
-libc.so: calloc
-libc.so: free
-libc.so: malloc
-libc.so: memalign
-libc.so: realloc
-libm.so: matherr

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

commit 52ae23b4bfa09fa1f42e3f659aaa057d1176d06b
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jun 26 09:31:11 2014 -0700

    Move remaining S390 code out of nptl/.

diff --git a/ChangeLog b/ChangeLog
index b71bf3b..ae25794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
 2014-06-26  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
+	folded into ...
+	* sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.
+	* sysdeps/unix/sysv/linux/s390/Versions
+	(libpthread: GLIBC_2.19): New version set.
+	* nptl/sysdeps/unix/sysv/linux/s390/Versions: File removed.
+	* sysdeps/unix/sysv/linux/s390/s390-64/Versions
+	(librt: GLIBC_2.3.3): New version set.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions: File removed.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-conf.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-conf.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-timed.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-trylock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/elision-unlock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/force-elision.h: Moved ...
+	* sysdeps/unix/sysv/linux/s390/force-elision.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/s390/lowlevellock.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pt-longjmp.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/pthread_once.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: ... here.
+
 	* nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
 	* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
 	(__libc_vfork): Define the function under this name.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Makefile b/nptl/sysdeps/unix/sysv/linux/s390/Makefile
deleted file mode 100644
index 269832f..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(enable-lock-elision),yes)
-libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
-			      elision-trylock
-
-elision-CFLAGS = -mhtm
-CFLAGS-elision-lock.c = $(elision-CFLAGS)
-CFLAGS-elision-timed.c = $(elision-CFLAGS)
-CFLAGS-elision-trylock.c = $(elision-CFLAGS)
-CFLAGS-elision-unlock.c = $(elision-CFLAGS)
-endif
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Versions b/nptl/sysdeps/unix/sysv/linux/s390/Versions
deleted file mode 100644
index 58632f4..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-libpthread {
-  GLIBC_2.19 {
-    longjmp; siglongjmp;
-  }
-}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
deleted file mode 100644
index 3b111dd..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ /dev/null
@@ -1,7 +0,0 @@
-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/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
index f91179d..768f926 100644
--- a/sysdeps/unix/sysv/linux/s390/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/Makefile
@@ -22,3 +22,16 @@ ifeq (yes,$(build-shared))
 sysdep_routines += v1-longjmp_chk
 endif
 endif
+
+ifeq ($(subdir),nptl)
+ifeq ($(enable-lock-elision),yes)
+libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
+			      elision-trylock
+
+elision-CFLAGS = -mhtm
+CFLAGS-elision-lock.c = $(elision-CFLAGS)
+CFLAGS-elision-timed.c = $(elision-CFLAGS)
+CFLAGS-elision-trylock.c = $(elision-CFLAGS)
+CFLAGS-elision-unlock.c = $(elision-CFLAGS)
+endif
+endif
diff --git a/sysdeps/unix/sysv/linux/s390/Versions b/sysdeps/unix/sysv/linux/s390/Versions
index f71a6bd..55518a7 100644
--- a/sysdeps/unix/sysv/linux/s390/Versions
+++ b/sysdeps/unix/sysv/linux/s390/Versions
@@ -8,3 +8,9 @@ libc {
     __vdso_clock_getres;
   }
 }
+
+libpthread {
+  GLIBC_2.19 {
+    longjmp; siglongjmp;
+  }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c b/sysdeps/unix/sysv/linux/s390/elision-conf.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c
rename to sysdeps/unix/sysv/linux/s390/elision-conf.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h b/sysdeps/unix/sysv/linux/s390/elision-conf.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h
rename to sysdeps/unix/sysv/linux/s390/elision-conf.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c b/sysdeps/unix/sysv/linux/s390/elision-lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c
rename to sysdeps/unix/sysv/linux/s390/elision-lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c b/sysdeps/unix/sysv/linux/s390/elision-timed.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c
rename to sysdeps/unix/sysv/linux/s390/elision-timed.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c b/sysdeps/unix/sysv/linux/s390/elision-trylock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c
rename to sysdeps/unix/sysv/linux/s390/elision-trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c b/sysdeps/unix/sysv/linux/s390/elision-unlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c
rename to sysdeps/unix/sysv/linux/s390/elision-unlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/force-elision.h b/sysdeps/unix/sysv/linux/s390/force-elision.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/force-elision.h
rename to sysdeps/unix/sysv/linux/s390/force-elision.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
rename to sysdeps/unix/sysv/linux/s390/jmp-unwind.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
rename to sysdeps/unix/sysv/linux/s390/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
rename to sysdeps/unix/sysv/linux/s390/pt-longjmp.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c b/sysdeps/unix/sysv/linux/s390/pthread_once.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c
rename to sysdeps/unix/sysv/linux/s390/pthread_once.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
index 83092db..3f4d960 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
@@ -5,3 +5,11 @@ libc {
     __frame_state_for; __register_frame_info_table;
   }
 }
+
+librt {
+  GLIBC_2.3.3 {
+    # Changed timer_t.
+    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    timer_settime;
+  }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c

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

commit 39507e4a6c52d67780d194dae8cfb636e2dbb87e
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jun 26 09:30:52 2014 -0700

    S390: Consolidate NPTL/non versions of vfork

diff --git a/ChangeLog b/ChangeLog
index 4d88bf9..b71bf3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2014-06-26  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
+	(__libc_vfork): Define the function under this name.
+	[!NOT_IN_libc] (__vfork): Make this an alias.
+	[!NOT_IN_libc] (vfork): Conditionalize the weak_alias.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Moved ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: ... here.
+	(__libc_vfork): Define the function under this name.
+	[!NOT_IN_libc] (__vfork): Make this an alias.
+	[!NOT_IN_libc] (vfork): Conditionalize the weak_alias.
+	* sysdeps/unix/sysv/linux/s390/pt-vfork.S: New file.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S: File removed.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S: File removed.
+	* sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list: Remove vfork.
+	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
+
 	* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the
 	code that was previously under [RESET_PID].
 	* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S
deleted file mode 100644
index 4908562..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
-
-   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 _ERRNO_H	1
-#include <bits/errno.h>
-#include <bits/wordsize.h>
-#include <tcb-offsets.h>
-
-/* Clone the calling process, but without copying the whole address space.
-   The calling process is suspended until the new process exits or is
-   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
-   and the process ID of the new process to the old process.  */
-
-ENTRY (__vfork)
-	ear	%r4,%a0
-	l	%r3,PID(%r4)
-	lcr	%r1,%r3
-	st	%r1,PID(%r4)
-
-	/* Do vfork system call.  */
-	svc	SYS_ify (vfork)
-
-	ltr	%r2,%r2
-	je	1f
-	st	%r3,PID(%r4)
-1:
-	/* Check for error.  */
-	lhi	%r4,-4095
-	clr	%r2,%r4
-	jnl	SYSCALL_ERROR_LABEL
-
-	/* Normal return.  */
-	br	%r14
-PSEUDO_END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
deleted file mode 100644
index 589209d..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
-
-   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 _ERRNO_H	1
-#include <bits/errno.h>
-#include <bits/wordsize.h>
-#include <tcb-offsets.h>
-
-/* Clone the calling process, but without copying the whole address space.
-   The calling process is suspended until the new process exits or is
-   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
-   and the process ID of the new process to the old process.  */
-
-ENTRY (__vfork)
-
-	ear	%r4,%a0
-	sllg	%r4,%r4,32
-	ear	%r4,%a1
-	l	%r3,PID(%r4)
-	lcr	%r1,%r3
-	st	%r1,PID(%r4)
-
-	/* Do vfork system call.  */
-	svc	SYS_ify (vfork)
-
-	ltgr	%r2,%r2
-	je	1f
-	st	%r3,PID(%r4)
-1:
-	/* Check for error.  */
-	lghi	%r4,-4095
-	clgr	%r2,%r4
-	jgnl	SYSCALL_ERROR_LABEL
-
-	/* Normal return.  */
-	br	%r14
-PSEUDO_END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/s390/pt-vfork.S b/sysdeps/unix/sysv/linux/s390/pt-vfork.S
new file mode 100644
index 0000000..65cc382
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/pt-vfork.S
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
index e946d33..ce9f210 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
@@ -2,7 +2,6 @@
 
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
 oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
-vfork		-	vfork		0	__vfork		vfork
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
similarity index 91%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
rename to sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
index 45411ba..290e464 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
@@ -27,7 +27,7 @@
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
    and the process ID of the new process to the old process.  */
 
-ENTRY (__vfork)
+ENTRY (__libc_vfork)
 	ear	%r4,%a0
 	lhi	%r1,1
 	icm	%r3,15,PID(%r4)
@@ -50,6 +50,10 @@ ENTRY (__vfork)
 
 	/* Normal return.  */
 	br	%r14
-PSEUDO_END(__vfork)
+PSEUDO_END (__libc_vfork)
+
+#if !NOT_IN_libc
+weak_alias (__libc_vfork, vfork)
+strong_alias (__libc_vfork, __vfork)
 libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)
+#endif
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index b826c5d..5b8c102 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -1,7 +1,5 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-vfork		-	vfork		0	__vfork		vfork
-
 # semaphore and shm system calls
 msgctl		-	msgctl		i:iip	__msgctl	msgctl
 msgget		-	msgget		i:ii	__msgget	msgget
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
similarity index 91%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
rename to sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
index 205e893..7de1bb0 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
@@ -27,8 +27,7 @@
    replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
    and the process ID of the new process to the old process.  */
 
-ENTRY (__vfork)
-
+ENTRY (__libc_vfork)
 	ear	%r4,%a0
 	sllg	%r4,%r4,32
 	ear	%r4,%a1
@@ -52,6 +51,10 @@ ENTRY (__vfork)
 
 	/* Normal return.  */
 	br	%r14
-PSEUDO_END(__vfork)
+PSEUDO_END (__libc_vfork)
+
+#if !NOT_IN_libc
+weak_alias (__libc_vfork, vfork)
+strong_alias (__libc_vfork, __vfork)
 libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)
+#endif

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

commit e549ee56584d0c25e1f9dfcb6b05947fb3950447
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jun 26 09:30:33 2014 -0700

    S390: Consolidate NPTL/non versions of clone

diff --git a/ChangeLog b/ChangeLog
index ed1ede4..4d88bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-06-26  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the
+	code that was previously under [RESET_PID].
+	* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S: File removed.
+	* nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S: File removed.
+
 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Moved ...
 	* sysdeps/aarch64/nptl/bits/pthreadtypes.h: ... here.
 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Moved ...
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/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/s390/s390-64/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/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/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
index f26c229..a5e1980 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
@@ -54,7 +54,6 @@ error:
 PSEUDO_END (__clone)
 
 thread_start:
-#ifdef RESET_PID
 	tmh	%r3,1		/* CLONE_THREAD == 0x00010000 */
 	jne	1f
 	lhi	%r2,-1
@@ -65,7 +64,6 @@ thread_start:
 	st	%r2,PID(%r3)
 	st	%r2,TID(%r3)
 1:
-#endif
 	/* fn is in gpr 1, arg in gpr 0 */
 	lr      %r2,%r0         /* set first parameter to void *arg */
 	ahi     %r15,-96        /* make room on the stack for the save area */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
index ee501b5..27ddf1f 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
@@ -55,7 +55,6 @@ error:
 PSEUDO_END (__clone)
 
 thread_start:
-#ifdef RESET_PID
 	tmh	%r3,1		/* CLONE_THREAD == 0x00010000 */
 	jne	1f
 	lhi	%r2,-1
@@ -68,7 +67,6 @@ thread_start:
 	st	%r2,PID(%r3)
 	st	%r2,TID(%r3)
 1:
-#endif
 	/* fn is in gpr 1, arg in gpr 0 */
 	lgr	%r2,%r0		/* set first parameter to void *arg */
 	aghi	%r15,-160	/* make room on the stack for the save area */

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

Summary of changes:
 ChangeLog                                          |  146 ++++++++++++++++++++
 nptl/sysdeps/unix/sysv/linux/s390/Makefile         |   10 --
 nptl/sysdeps/unix/sysv/linux/s390/Versions         |    5 -
 nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S  |    9 --
 .../unix/sysv/linux/s390/s390-32/pt-vfork.S        |   52 -------
 nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions |    7 -
 nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S  |    9 --
 .../unix/sysv/linux/s390/s390-64/pt-vfork.S        |   55 --------
 sysdeps/unix/sysv/linux/s390/Makefile              |   13 ++
 sysdeps/unix/sysv/linux/s390/Versions              |    6 +
 .../unix/sysv/linux/s390/elision-conf.c            |    0
 .../unix/sysv/linux/s390/elision-conf.h            |    0
 .../unix/sysv/linux/s390/elision-lock.c            |    0
 .../unix/sysv/linux/s390/elision-timed.c           |    0
 .../unix/sysv/linux/s390/elision-trylock.c         |    0
 .../unix/sysv/linux/s390/elision-unlock.c          |    0
 .../unix/sysv/linux/s390/force-elision.h           |    0
 .../unix/sysv/linux/s390/jmp-unwind.c              |    0
 .../linux/s390/{s390-32/nptl => }/libanl.abilist   |    0
 .../linux/s390/{s390-32/nptl => }/localplt.data    |    0
 .../unix/sysv/linux/s390/lowlevellock.h            |    0
 .../unix/sysv/linux/s390/pt-longjmp.c              |    0
 sysdeps/unix/sysv/linux/{sh => s390}/pt-vfork.S    |    0
 .../unix/sysv/linux/s390/pthread_mutex_cond_lock.c |    0
 .../unix/sysv/linux/s390/pthread_mutex_lock.c      |    0
 .../unix/sysv/linux/s390/pthread_mutex_timedlock.c |    0
 .../unix/sysv/linux/s390/pthread_mutex_trylock.c   |    0
 .../unix/sysv/linux/s390/pthread_once.c            |    0
 .../linux/s390/s390-32/{nptl => }/c++-types.data   |    0
 sysdeps/unix/sysv/linux/s390/s390-32/clone.S       |    2 -
 .../sysv/linux/s390/s390-32/{nptl => }/ld.abilist  |    0
 .../s390-32/{nptl => }/libBrokenLocale.abilist     |    0
 .../linux/s390/s390-32/{nptl => }/libc.abilist     |    0
 .../linux/s390/s390-32/{nptl => }/libcrypt.abilist |    0
 .../linux/s390/s390-32/{nptl => }/libdl.abilist    |    0
 .../linux/s390/s390-32/{nptl => }/libm.abilist     |    0
 .../linux/s390/s390-32/{nptl => }/libnsl.abilist   |    0
 .../s390/s390-32/{nptl => }/libpthread.abilist     |    0
 .../s390/s390-32/{nptl => }/libresolv.abilist      |    0
 .../linux/s390/s390-32/{nptl => }/librt.abilist    |    0
 .../s390/s390-32/{nptl => }/libthread_db.abilist   |    0
 .../linux/s390/s390-32/{nptl => }/libutil.abilist  |    0
 sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list |    1 -
 .../unix/sysv/linux/s390/s390-32/sysdep-cancel.h   |    0
 .../unix/sysv/linux/s390/s390-32/vfork.S           |   10 +-
 sysdeps/unix/sysv/linux/s390/s390-64/Versions      |    8 +
 .../linux/s390/s390-64/{nptl => }/c++-types.data   |    0
 sysdeps/unix/sysv/linux/s390/s390-64/clone.S       |    2 -
 .../sysv/linux/s390/s390-64/{nptl => }/ld.abilist  |    0
 .../s390-64/{nptl => }/libBrokenLocale.abilist     |    0
 .../linux/s390/s390-64/{nptl => }/libc.abilist     |    0
 .../linux/s390/s390-64/{nptl => }/libcrypt.abilist |    0
 .../linux/s390/s390-64/{nptl => }/libdl.abilist    |    0
 .../linux/s390/s390-64/{nptl => }/libm.abilist     |    0
 .../linux/s390/s390-64/{nptl => }/libnsl.abilist   |    0
 .../s390/s390-64/{nptl => }/libpthread.abilist     |    0
 .../s390/s390-64/{nptl => }/libresolv.abilist      |    0
 .../linux/s390/s390-64/{nptl => }/librt.abilist    |    0
 .../s390/s390-64/{nptl => }/libthread_db.abilist   |    0
 .../linux/s390/s390-64/{nptl => }/libutil.abilist  |    0
 .../sysv/linux/s390/s390-64/nptl/libanl.abilist    |    6 -
 .../sysv/linux/s390/s390-64/nptl/localplt.data     |    7 -
 sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list |    2 -
 .../unix/sysv/linux/s390/s390-64/sysdep-cancel.h   |    0
 .../unix/sysv/linux/s390/s390-64/timer_create.c    |    0
 .../unix/sysv/linux/s390/s390-64/timer_delete.c    |    0
 .../unix/sysv/linux/s390/s390-64/timer_getoverr.c  |    0
 .../unix/sysv/linux/s390/s390-64/timer_gettime.c   |    0
 .../unix/sysv/linux/s390/s390-64/timer_settime.c   |    0
 .../unix/sysv/linux/s390/s390-64/vfork.S           |   11 +-
 70 files changed, 187 insertions(+), 174 deletions(-)
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/Makefile
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/Versions
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
 delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-conf.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-conf.h (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-lock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-timed.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-trylock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/elision-unlock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/force-elision.h (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/jmp-unwind.c (100%)
 rename sysdeps/unix/sysv/linux/s390/{s390-32/nptl => }/libanl.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/{s390-32/nptl => }/localplt.data (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/lowlevellock.h (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pt-longjmp.c (100%)
 copy sysdeps/unix/sysv/linux/{sh => s390}/pt-vfork.S (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pthread_mutex_cond_lock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pthread_mutex_lock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pthread_mutex_timedlock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pthread_mutex_trylock.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/pthread_once.c (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/c++-types.data (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/ld.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libBrokenLocale.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libc.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libcrypt.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libdl.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libm.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libnsl.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libpthread.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libresolv.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/librt.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libthread_db.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-32/{nptl => }/libutil.abilist (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-32/vfork.S (91%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/c++-types.data (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/ld.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libBrokenLocale.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libc.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libcrypt.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libdl.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libm.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libnsl.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libpthread.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libresolv.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/librt.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libthread_db.abilist (100%)
 rename sysdeps/unix/sysv/linux/s390/s390-64/{nptl => }/libutil.abilist (100%)
 delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist
 delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/timer_create.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/timer_delete.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/timer_getoverr.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/timer_gettime.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/timer_settime.c (100%)
 rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/s390/s390-64/vfork.S (91%)


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]