This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-mips created. glibc-2.19-710-g5dad577
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2014 16:59:24 -0000
- Subject: GNU C Library master sources branch roland/nptl-mips created. glibc-2.19-710-g5dad577
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-mips has been created
at 5dad577ab886438f9b97eeccccb94ca01fd05a30 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5dad577ab886438f9b97eeccccb94ca01fd05a30
commit 5dad577ab886438f9b97eeccccb94ca01fd05a30
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Jun 27 09:59:08 2014 -0700
MIPS: Consolidate nptl/ subdirectories under linux/...
diff --git a/ChangeLog b/ChangeLog
index cc6ab11..e8d986c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,138 @@
2014-06-27 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/c++-types.data: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/ld.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist:
+ ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/librt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist:
+ ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist:
+ ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist:
+ ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist:
+ ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist:
+ Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist: ... here.
+ * sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h: Moved ...
+ * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: ... here.
+
* sysdeps/unix/sysv/linux/mips/vfork.S: Incorporate
SAVE_PID and RESTORE_PID blocks from nptl/pt-vfork.S.
* sysdeps/unix/sysv/linux/mips/nptl/vfork.S: File removed.
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/mips/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/mips/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3c9ab6234f6b72e08f152fa9bd0aa6bc35c873cf
commit 3c9ab6234f6b72e08f152fa9bd0aa6bc35c873cf
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Jun 27 09:58:51 2014 -0700
MIPS: Consolidate NPTL/non versions of vfork
diff --git a/ChangeLog b/ChangeLog
index 510e78a..cc6ab11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-27 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/unix/sysv/linux/mips/vfork.S: Incorporate
+ SAVE_PID and RESTORE_PID blocks from nptl/pt-vfork.S.
+ * sysdeps/unix/sysv/linux/mips/nptl/vfork.S: File removed.
+ * sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S: File removed.
+ * sysdeps/unix/sysv/linux/mips/pt-vfork.S: New file.
+
2014-06-27 Joseph Myers <joseph@codesourcery.com>
* configure.ac (libc_commonpagesize): Remove variable.
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S
deleted file mode 100644
index 85c55c9..0000000
--- a/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2005-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 <tls.h>
-
-/* Save the PID value. */
-#define SAVE_PID \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Negate it. */ \
- sw a2, PID_OFFSET(v1); /* Store the temporary PID. */
-
-/* Restore the old PID value in the parent. */
-#define RESTORE_PID \
- beqz v0, 1f; /* If we are the parent... */ \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Re-negate it. */ \
- sw a2, PID_OFFSET(v1); /* Restore the PID. */ \
-1:
-
-#include <sysdeps/unix/sysv/linux/mips/vfork.S>
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/vfork.S b/sysdeps/unix/sysv/linux/mips/nptl/vfork.S
deleted file mode 100644
index 7f1068c..0000000
--- a/sysdeps/unix/sysv/linux/mips/nptl/vfork.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2005-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 <tls.h>
-
-/* Save the PID value. */
-#define SAVE_PID \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Negate it. */ \
- bnez a2, 1f; /* If it was zero... */ \
- lui a2, 0x8000; /* use 0x80000000 instead. */ \
-1: sw a2, PID_OFFSET(v1); /* Store the temporary PID. */
-
-/* Restore the old PID value in the parent. */
-#define RESTORE_PID \
- beqz v0, 1f; /* If we are the parent... */ \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Re-negate it. */ \
- lui a0, 0x8000; /* Load 0x80000000... */ \
- bne a2, a0, 2f; /* ... compare against it... */ \
- li a2, 0; /* ... use 0 instead. */ \
-2: sw a2, PID_OFFSET(v1); /* Restore the PID. */ \
-1:
-
-#include <sysdeps/unix/sysv/linux/mips/vfork.S>
diff --git a/sysdeps/unix/sysv/linux/mips/pt-vfork.S b/sysdeps/unix/sysv/linux/mips/pt-vfork.S
new file mode 100644
index 0000000..65cc382
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/pt-vfork.S
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S>
diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
index 0913d6b..80c362d 100644
--- a/sysdeps/unix/sysv/linux/mips/vfork.S
+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
@@ -21,14 +21,7 @@
#include <sysdep.h>
#include <asm/unistd.h>
#include <sgidefs.h>
-
-#ifndef SAVE_PID
-#define SAVE_PID
-#endif
-
-#ifndef RESTORE_PID
-#define RESTORE_PID
-#endif
+#include <tls.h>
/* int vfork() */
@@ -67,7 +60,13 @@ NESTED(__vfork,FRAMESZ,sp)
PTR_ADDU sp, FRAMESZ
cfi_adjust_cfa_offset (-FRAMESZ)
- SAVE_PID
+ /* Save the PID value. */
+ READ_THREAD_POINTER(v1) /* Get the thread pointer. */
+ lw a2, PID_OFFSET(v1) /* Load the saved PID. */
+ subu a2, $0, a2 /* Negate it. */
+ bnez a2, 1f /* If it was zero... */
+ lui a2, 0x8000 /* use 0x80000000 instead. */
+1: sw a2, PID_OFFSET(v1) /* Store the temporary PID. */
li a0, 0x4112 /* CLONE_VM | CLONE_VFORK | SIGCHLD */
move a1, sp
@@ -76,7 +75,16 @@ NESTED(__vfork,FRAMESZ,sp)
li v0,__NR_clone
syscall
- RESTORE_PID
+ /* Restore the old PID value in the parent. */
+ beqz v0, 1f /* If we are the parent... */
+ READ_THREAD_POINTER(v1) /* Get the thread pointer. */
+ lw a2, PID_OFFSET(v1) /* Load the saved PID. */
+ subu a2, $0, a2 /* Re-negate it. */
+ lui a0, 0x8000 /* Load 0x80000000... */
+ bne a2, a0, 2f /* ... compare against it... */
+ li a2, 0 /* ... use 0 instead. */
+2: sw a2, PID_OFFSET(v1) /* Restore the PID. */
+1:
cfi_remember_state
bnez a3,L(error)
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources