This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 6f3af8a0a9db428a80581e8569ecc643808dbf5c Author: Samuel Thibault <[email protected]> Date: Tue Jan 17 10:35:16 2017 +0000 New upstream snapshot --- Makeconf | 2 +- random/random.c | 46 +++++++++++++++++++++++----------------------- startup/startup.c | 2 ++ 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Makeconf b/Makeconf index 8e24fc4..02594c6 100644 --- a/Makeconf +++ b/Makeconf @@ -79,7 +79,7 @@ CPPFLAGS += $(INCLUDES) \ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ $($*-CPPFLAGS) CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -g -O3 \ - $($*-CFLAGS) + -fno-strict-aliasing $($*-CFLAGS) # Include the configure-generated file of parameters. # This sets up variables for build tools and installation directories. diff --git a/random/random.c b/random/random.c index 828e83a..69176b7 100644 --- a/random/random.c +++ b/random/random.c @@ -309,30 +309,30 @@ trivfs_S_io_select (struct trivfs_protid *cred, if (*type == 0) return 0; - pthread_mutex_lock (&global_lock); + pthread_mutex_lock (&global_lock); - while (1) - { - /* XXX Before initialization, readable_pool depends on length. */ - int avail = readable_pool (POOLSIZE/2, level); - - if (avail != 0 || *type & SELECT_WRITE) - { - *type = (avail ? SELECT_READ : 0) | (*type & SELECT_WRITE); - pthread_mutex_unlock (&global_lock); - return 0; - } - - ports_interrupt_self_on_port_death (cred, reply); - read_blocked = 1; - - if (pthread_hurd_cond_wait_np (&select_alert, &global_lock)) - { - *type = 0; - pthread_mutex_unlock (&global_lock); - return EINTR; - } - } + while (1) + { + /* XXX Before initialization, readable_pool depends on length. */ + int avail = readable_pool (POOLSIZE/2, level); + + if (avail != 0 || *type & SELECT_WRITE) + { + *type = (avail ? SELECT_READ : 0) | (*type & SELECT_WRITE); + pthread_mutex_unlock (&global_lock); + return 0; + } + + ports_interrupt_self_on_port_death (cred, reply); + read_blocked = 1; + + if (pthread_hurd_cond_wait_np (&select_alert, &global_lock)) + { + *type = 0; + pthread_mutex_unlock (&global_lock); + return EINTR; + } + } } diff --git a/startup/startup.c b/startup/startup.c index 2eba563..913742c 100644 --- a/startup/startup.c +++ b/startup/startup.c @@ -994,6 +994,8 @@ frob_kernel_process (void) err = argz_create (&global_argv[1], &argz, &argzlen); assert_perror (err); + err = argz_insert (&argz, &argzlen, argz, "gnumach"); + assert_perror (err); argc = argz_count (argz, argzlen); windowsz = round_page (((argc + 1) * sizeof (char *)) + argzlen); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
