This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-1189-g660b7bf
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jan 2018 22:50:02 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-1189-g660b7bf
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 660b7bff81676aef6a7b068eb137efd74b30c628 (commit)
via 41cdb1eb5a3627c3b6b6c4f74503233d9689a397 (commit)
via f817775364018856379b9475efd7b4345db66dc6 (commit)
via 06fac9f50335a5669672c4ac9ca93e5f43288822 (commit)
via f4d3cee3a00211b346620f88abc5cb81c318cabe (commit)
via 7dab2d00ee6098e6a771a3a566c71a614ef18bb2 (commit)
via 903d3633ec9e9ffe699611351200bebaf2152bd8 (commit)
from d4d5b2ddf348bd1e310a5d73da58bae9ec09a41e (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=660b7bff81676aef6a7b068eb137efd74b30c628
commit 660b7bff81676aef6a7b068eb137efd74b30c628
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 23:49:18 2018 +0100
hurd: fix warning
* sysdeps/mach/hurd/getresgid.c (__getresgid): Set result from
critical section to make code simpler and avoid warning.
* sysdeps/mach/hurd/getresuid.c (__getresuid): Set result from
critical section to make code simpler and avoid warning.
diff --git a/ChangeLog b/ChangeLog
index 95e2c07..5eebc64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,10 @@
to global scope.
* sysdeps/mach/pagecopy.h (PAGE_THRESHOLD): Rename to
PAGE_COPY_THRESHOLD and set to benchmarked 16384.
+ * sysdeps/mach/hurd/getresgid.c (__getresgid): Set result from
+ critical section to make code simpler and avoid warning.
+ * sysdeps/mach/hurd/getresuid.c (__getresuid): Set result from
+ critical section to make code simpler and avoid warning.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/sysdeps/mach/hurd/getresgid.c b/sysdeps/mach/hurd/getresgid.c
index 41823ff..e5eeba8 100644
--- a/sysdeps/mach/hurd/getresgid.c
+++ b/sysdeps/mach/hurd/getresgid.c
@@ -27,7 +27,6 @@ int
__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
{
error_t err;
- gid_t real, eff, saved;
HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_id.lock);
@@ -40,22 +39,18 @@ __getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
err = EGRATUITOUS;
else
{
- real = _hurd_id.aux.gids[0];
- eff = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
- saved = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1];
+ gid_t real = _hurd_id.aux.gids[0];
+
+ *rgid = real;
+ *egid = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
+ *sgid = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1];
}
}
__mutex_unlock (&_hurd_id.lock);
HURD_CRITICAL_END;
- if (err)
- return __hurd_fail (err);
-
- *rgid = real;
- *egid = eff;
- *sgid = saved;
- return 0;
+ return __hurd_fail (err);
}
libc_hidden_def (__getresgid)
weak_alias (__getresgid, getresgid)
diff --git a/sysdeps/mach/hurd/getresuid.c b/sysdeps/mach/hurd/getresuid.c
index 1f23403..4af4786 100644
--- a/sysdeps/mach/hurd/getresuid.c
+++ b/sysdeps/mach/hurd/getresuid.c
@@ -27,7 +27,6 @@ int
__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
{
error_t err;
- uid_t real, eff, saved;
HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_id.lock);
@@ -40,22 +39,18 @@ __getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
err = EGRATUITOUS;
else
{
- real = _hurd_id.aux.uids[0];
- eff = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
- saved = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1];
+ uid_t real = _hurd_id.aux.uids[0];
+
+ *ruid = real;
+ *euid = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
+ *suid = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1];
}
}
__mutex_unlock (&_hurd_id.lock);
HURD_CRITICAL_END;
- if (err)
- return __hurd_fail (err);
-
- *ruid = real;
- *euid = eff;
- *suid = saved;
- return 0;
+ return __hurd_fail (err);
}
libc_hidden_def (__getresuid)
weak_alias (__getresuid, getresuid)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=41cdb1eb5a3627c3b6b6c4f74503233d9689a397
commit 41cdb1eb5a3627c3b6b6c4f74503233d9689a397
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 22:09:30 2018 +0100
hurd: Fix enabling vm_copy
Benchmarked on
http://lists.gnu.org/archive/html/bug-hurd/2014-12/msg00081.html
* sysdeps/mach/pagecopy.h (PAGE_THRESHOLD): Rename to
PAGE_COPY_THRESHOLD and set to benchmarked 16384.
diff --git a/ChangeLog b/ChangeLog
index 5e62415..95e2c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
__task_terminate would ever return successfully.
* sysdeps/mach/hurd/profil.c (special_profil_failure): Move variable
to global scope.
+ * sysdeps/mach/pagecopy.h (PAGE_THRESHOLD): Rename to
+ PAGE_COPY_THRESHOLD and set to benchmarked 16384.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/sysdeps/mach/pagecopy.h b/sysdeps/mach/pagecopy.h
index 6285ffb..8583df4 100644
--- a/sysdeps/mach/pagecopy.h
+++ b/sysdeps/mach/pagecopy.h
@@ -19,8 +19,8 @@
#include <mach.h>
/* Threshold at which vm_copy is more efficient than well-optimized copying
- by words. This parameter should be tuned as necessary. */
-#define PAGE_THRESHOLD (2 * PAGE_SIZE) /* XXX ? */
+ by words. */
+#define PAGE_COPY_THRESHOLD (16384)
#define PAGE_SIZE __vm_page_size
#define PAGE_COPY_FWD(dstp, srcp, nbytes_left, nbytes) \
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f817775364018856379b9475efd7b4345db66dc6
commit f817775364018856379b9475efd7b4345db66dc6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 22:01:34 2018 +0100
hurd: fix warning
Making `special_profil_failure' both avoids warning "variable
'special_profil_failure' set but not used", and makes it easier to
access with gdb.
* sysdeps/mach/hurd/profil.c (special_profil_failure): Move variable
to global scope.
diff --git a/ChangeLog b/ChangeLog
index 5dd9e9f..5e62415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@
MACH_IPC_COMPAT.
* sysdeps/mach/hurd/dl-sysdep.c (_exit): Call LOSE and abort() if
__task_terminate would ever return successfully.
+ * sysdeps/mach/hurd/profil.c (special_profil_failure): Move variable
+ to global scope.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 2fe8f9d..b3f201b 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -138,6 +138,8 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
}
weak_alias (__profil, profil)
+static volatile error_t special_profil_failure;
+
/* Fetch PC samples. This function must be very careful not to depend
on Hurd threadvar variables. We arrange that by using a special
stub arranged for at the end of this file. */
@@ -154,7 +156,6 @@ fetch_samples (void)
pc_samples, &nsamples);
if (err)
{
- static volatile error_t special_profil_failure;
static volatile int a, b;
special_profil_failure = err;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=06fac9f50335a5669672c4ac9ca93e5f43288822
commit 06fac9f50335a5669672c4ac9ca93e5f43288822
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 22:00:23 2018 +0100
hurd: fix warning
* sysdeps/mach/hurd/dl-sysdep.c (_exit): Call LOSE and abort() if
__task_terminate would ever return successfully.
diff --git a/ChangeLog b/ChangeLog
index 9582d8c..5dd9e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@
* mach/mach/mach_traps.h: Drop comment about MACH_IPC_COMPAT.
* sysdeps/mach/hurd/fork.c (__fork): Drop special casing
MACH_IPC_COMPAT.
+ * sysdeps/mach/hurd/dl-sysdep.c (_exit): Call LOSE and abort() if
+ __task_terminate would ever return successfully.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 2cd63bb..ef96df0 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -643,6 +643,9 @@ _exit (int status)
W_EXITCODE (status, 0), 0);
while (__task_terminate (__mach_task_self ()))
__mach_task_self_ = (__mach_task_self) ();
+
+ LOSE;
+ abort ();
}
/* We need this alias to satisfy references from libc_pic.a objects
that were affected by the libc_hidden_proto declaration for _exit. */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f4d3cee3a00211b346620f88abc5cb81c318cabe
commit f4d3cee3a00211b346620f88abc5cb81c318cabe
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 21:44:57 2018 +0100
hurd: make build-many-glibcs.py use mainline mig
Some warnings come from code generated by mig, so we need a very recent
version for now.
* scripts/build-many-glibcs.py (checkout_vcs): Add mig repository
URL, and run autoreconf, make it the default for now.
diff --git a/ChangeLog b/ChangeLog
index 7d7800d..9582d8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
timer_ptr2id to cast struct timer_node * to void *.
* scripts/build-many-glibcs.py [os == gnu] (build_gcc): Pass
--disable-libcilkrts to gcc configure.
+ (checkout_vcs): Add mig repository URL, and run autoreconf, make it the
+ default for now.
* sysdeps/mach/hurd/Makefile [$(subdir)==nis]: Add
-DUSE_BINDINGDIR=1 to CFLAGS-ypclnt.c.
* mach/Machrules (MIGFLAGS): Do not set -DMACH_IPC_COMPAT=0.
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index fbb701e..d7adcc8 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -704,7 +704,7 @@ class Context(object):
'linux': '4.14',
'mpc': '1.1.0',
'mpfr': '4.0.0',
- 'mig': '1.8',
+ 'mig': 'vcs-mainline',
'gnumach': '1.8',
'hurd': 'vcs-mainline'}
use_versions = {}
@@ -786,6 +786,13 @@ class Context(object):
r = self.git_checkout(component, git_url, git_branch, update)
self.fix_glibc_timestamps()
return r
+ elif component == 'mig':
+ git_url = 'git://git.savannah.gnu.org/hurd/mig.git'
+ git_branch = 'master'
+ r = self.git_checkout(component, git_url, git_branch, update)
+ subprocess.run(['autoreconf', '-i'],
+ cwd=self.component_srcdir(component), check=True)
+ return r
elif component == 'hurd':
git_url = 'git://git.savannah.gnu.org/hurd/hurd.git'
git_branch = 'master'
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7dab2d00ee6098e6a771a3a566c71a614ef18bb2
commit 7dab2d00ee6098e6a771a3a566c71a614ef18bb2
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 21:40:08 2018 +0100
hurd: drop elder MACH_IPC_COMPAT handling
This was dropped from GNU Mach in 2006.
* mach/Machrules (MIGFLAGS): Do not set -DMACH_IPC_COMPAT=0.
* mach/mach/mach_traps.h: Drop comment about MACH_IPC_COMPAT.
* sysdeps/mach/hurd/fork.c (__fork): Drop special casing
MACH_IPC_COMPAT.
diff --git a/ChangeLog b/ChangeLog
index 4e1e4bf..7d7800d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
--disable-libcilkrts to gcc configure.
* sysdeps/mach/hurd/Makefile [$(subdir)==nis]: Add
-DUSE_BINDINGDIR=1 to CFLAGS-ypclnt.c.
+ * mach/Machrules (MIGFLAGS): Do not set -DMACH_IPC_COMPAT=0.
+ * mach/mach/mach_traps.h: Drop comment about MACH_IPC_COMPAT.
+ * sysdeps/mach/hurd/fork.c (__fork): Drop special casing
+ MACH_IPC_COMPAT.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/mach/Machrules b/mach/Machrules
index 49e6399..4f9ec42 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -51,7 +51,7 @@ $(objpfx)dummy.mk:
$(make-target-directory)
echo '# Empty' > $@
-MIGFLAGS = -DMACH_IPC_COMPAT=0 -DSTANDALONE -DTypeCheck=0 \
+MIGFLAGS = -DSTANDALONE -DTypeCheck=0 \
$(+includes) $(migdefines) -subrprefix __
# Putting CC in the enivronment makes the mig wrapper script
# use the same compiler setup we are using to run cpp.
diff --git a/mach/mach/mach_traps.h b/mach/mach/mach_traps.h
index 5e09a95..cefbd2d 100644
--- a/mach/mach/mach_traps.h
+++ b/mach/mach/mach_traps.h
@@ -17,8 +17,7 @@
/* Declare the few Mach system calls (except mach_msg, in <mach/message.h>).
This does not include the kernel RPC shortcut calls (in <mach-shortcuts.h>).
-
- This file omits the MACH_IPC_COMPAT functions. */
+ */
#ifndef _MACH_MACH_TRAPS_H
diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c
index fe3f544..b55eecf 100644
--- a/sysdeps/mach/hurd/fork.c
+++ b/sysdeps/mach/hurd/fork.c
@@ -213,38 +213,9 @@ __fork (void)
{
/* This is a receive right. We want to give the child task
its own new receive right under the same name. */
- err = __mach_port_allocate_name (newtask,
- MACH_PORT_RIGHT_RECEIVE,
- portnames[i]);
- if (err == KERN_NAME_EXISTS)
- {
- /* It already has a right under this name (?!). Well,
- there is this bizarre old Mach IPC feature (in #ifdef
- MACH_IPC_COMPAT in the ukernel) which results in new
- tasks getting a new receive right for task special
- port number 2. What else might be going on I'm not
- sure. So let's check. */
-#if !MACH_IPC_COMPAT
-#define TASK_NOTIFY_PORT 2
-#endif
- assert (({ mach_port_t thisport, notify_port;
- mach_msg_type_name_t poly;
- (__task_get_special_port (newtask,
- TASK_NOTIFY_PORT,
- ¬ify_port) == 0 &&
- __mach_port_extract_right
- (newtask,
- portnames[i],
- MACH_MSG_TYPE_MAKE_SEND,
- &thisport, &poly) == 0 &&
- (thisport == notify_port) &&
- __mach_port_deallocate (__mach_task_self (),
- thisport) == 0 &&
- __mach_port_deallocate (__mach_task_self (),
- notify_port) == 0);
- }));
- }
- else if (err)
+ if (err = __mach_port_allocate_name (newtask,
+ MACH_PORT_RIGHT_RECEIVE,
+ portnames[i]))
LOSE;
if (porttypes[i] & MACH_PORT_TYPE_SEND)
{
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=903d3633ec9e9ffe699611351200bebaf2152bd8
commit 903d3633ec9e9ffe699611351200bebaf2152bd8
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 27 21:37:29 2018 +0100
hurd: fix warning
* sysdeps/mach/hurd/Makefile [$(subdir)==nis]: Add
-DUSE_BINDINGDIR=1 to CFLAGS-ypclnt.c.
diff --git a/ChangeLog b/ChangeLog
index 88f6d93..4e1e4bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
timer_ptr2id to cast struct timer_node * to void *.
* scripts/build-many-glibcs.py [os == gnu] (build_gcc): Pass
--disable-libcilkrts to gcc configure.
+ * sysdeps/mach/hurd/Makefile [$(subdir)==nis]: Add
+ -DUSE_BINDINGDIR=1 to CFLAGS-ypclnt.c.
2018-01-27 James Clarke <jrtc27@jrtc27.com>
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index f0d3373..492ace0 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -203,4 +203,8 @@ sysdep_headers += net/ethernet.h net/if_arp.h net/if_ether.h net/if_ppp.h \
net/route.h
endif
+ifeq ($(subdir),nis)
+CFLAGS-ypclnt.c += -DUSE_BINDINGDIR=1
+endif
+
endif # in-Makerules
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 18 ++++++++++++++++++
mach/Machrules | 2 +-
mach/mach/mach_traps.h | 3 +--
scripts/build-many-glibcs.py | 9 ++++++++-
sysdeps/mach/hurd/Makefile | 4 ++++
sysdeps/mach/hurd/dl-sysdep.c | 3 +++
sysdeps/mach/hurd/fork.c | 35 +++--------------------------------
sysdeps/mach/hurd/getresgid.c | 17 ++++++-----------
sysdeps/mach/hurd/getresuid.c | 17 ++++++-----------
sysdeps/mach/hurd/profil.c | 3 ++-
sysdeps/mach/pagecopy.h | 4 ++--
11 files changed, 54 insertions(+), 61 deletions(-)
hooks/post-receive
--
GNU C Library master sources