This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository gnumach.
commit c9aadea510a18c48dc2c2ceaf66311585e632008 Author: Samuel Thibault <[email protected]> Date: Fri Dec 11 01:55:25 2015 +0000 Imported Upstream version 1.6+git20151211 --- ChangeLog | 28 ++++ build-aux/compile | 2 +- build-aux/config.guess | 47 ++---- build-aux/config.sub | 36 ++-- build-aux/depcomp | 2 +- build-aux/install-sh | 373 ++++++++++++++++++++++------------------- build-aux/mdate-sh | 8 +- build-aux/missing | 2 +- build-aux/test-driver | 15 +- configure | 20 +-- doc/mach.info | 240 +++++++++++++------------- doc/mach.info-1 | 8 +- doc/mach.info-2 | 4 +- doc/stamp-vti | 8 +- doc/version.texi | 8 +- i386/i386/locore.S | 3 + i386/i386at/lpr.c | 2 +- linux/dev/drivers/block/ahci.c | 4 +- version.m4 | 2 +- vm/vm_map.c | 2 + vm/vm_object.c | 4 + 21 files changed, 413 insertions(+), 405 deletions(-) diff --git a/ChangeLog b/ChangeLog index 576763d..e51b563 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2015-12-11 Samuel Thibault <[email protected]> + + Fix boot under kvm in linux 4.3 + * i386/i386/locore.S (discover_x86_cpu_type): Disable Cyrix CPU discovery. + +2015-11-29 Samuel Thibault <[email protected]> + + Nicer out of memory condition reporting + * vm/vm_object.c (_vm_object_allocate): Return 0 immediately when + kmem_cache_alloc returned 0. + (vm_object_allocate): Panic when _vm_object_allocate returns 0. + +2015-11-27 Samuel Thibault <[email protected]> + + Fix wired accounting + * vm/vm_map.c (vm_map_pageable_common): Put back wired_count decrementation + into user_wired_count test. + + Fix ahci unit MAX_PORTS check + * linux/dev/drivers/block/ahci.c (ahci_do_request): Fix checking unit + against MAX_PORTS. + + Fix bound + * i386/i386at/lpr.c (lprprobe): Fix checking unit against NLPR. + + Fix missing format in printk + * linux/dev/drivers/block/ahci.c (ahci_probe_dev): Add missing format. + 2015-10-31 Thomas Schwinge <[email protected]> GNU Mach 1.6 diff --git a/build-aux/compile b/build-aux/compile index a85b723..531136b 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/config.guess b/build-aux/config.guess index 1659250..1f5c50c 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2015-08-20' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches to <[email protected]>. +# Please send patches with a ChangeLog entry to [email protected]. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,27 +168,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ - echo unknown)` + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown - ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -204,13 +197,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac - # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` - ;; - esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -221,13 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "${machine}-${os}${release}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -249,9 +235,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; - *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix - exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -596,9 +579,8 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -950,9 +932,6 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; - e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1041,7 +1020,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} diff --git a/build-aux/config.sub b/build-aux/config.sub index 1acc966..bba4efb 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2014-09-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ timestamp='2015-08-20' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <[email protected]>. +# Please send patches with a ChangeLog entry to [email protected]. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ Report bugs and patches to <[email protected]>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -255,13 +255,12 @@ case $basic_machine in | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ - | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -306,7 +305,7 @@ case $basic_machine in | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,7 +313,6 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -329,9 +327,6 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -377,13 +372,12 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ - | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ + | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -430,13 +424,12 @@ case $basic_machine in | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -444,7 +437,6 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ - | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -521,9 +513,6 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; - asmjs) - basic_machine=asmjs-unknown - ;; aux) basic_machine=m68k-apple os=-aux @@ -785,9 +774,6 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -1379,7 +1365,7 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/build-aux/depcomp b/build-aux/depcomp index fc98710..4ebd5b3 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index 59990a1..377bb86 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2014-09-12.12; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,15 +41,19 @@ scriptversion=2014-09-12.12; # UTC # This script is compatible with the BSD install script, but was written # from scratch. -tab=' ' nl=' ' -IFS=" $tab$nl" +IFS=" "" $nl" -# Set DOITPROG to "echo" to test this script. +# set DOITPROG to echo to test this script +# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -doit_exec=${doit:-exec} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -64,6 +68,17 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + posix_mkdir= # Desired mode of installed file. @@ -82,7 +97,7 @@ dir_arg= dst_arg= copy_on_change=false -is_target_a_directory=possibly +no_target_directory= usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -122,57 +137,46 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) - is_target_a_directory=always - dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) is_target_a_directory=never;; + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done -# We allow the use of options -d and -T together, by making -d -# take the precedence; this is for compatibility with GNU install. - -if test -n "$dir_arg"; then - if test -n "$dst_arg"; then - echo "$0: target directory not allowed when installing a directory." >&2 - exit 1 - fi -fi - if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -204,15 +208,6 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then - if test $# -gt 1 || test "$is_target_a_directory" = always; then - if test ! -d "$dst_arg"; then - echo "$0: $dst_arg: Is not a directory." >&2 - exit 1 - fi - fi -fi - -if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -228,16 +223,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -274,15 +269,41 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test "$is_target_a_directory" = never; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - dstdir=`dirname "$dst"` + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + test -d "$dstdir" dstdir_status=$? fi @@ -293,81 +314,74 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # $RANDOM is not portable (e.g. dash); use it when possible to - # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # As "mkdir -p" follows symlinks and we work in /tmp possibly; so - # create the $tmpdir first (and fail if unsuccessful) to make sure - # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -377,51 +391,53 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac + eval "$initialize_posix_glob" + oIFS=$IFS IFS=/ - set -f + $posix_glob set -f set fnord $dstdir shift - set +f + $posix_glob set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -456,12 +472,15 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - set +f && + $posix_glob set +f && + test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -474,24 +493,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index 9e2c0c9..b3719cf 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -1,9 +1,9 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2015-04-09.19; # UTC +scriptversion=2010-08-21.06; # UTC -# Copyright (C) 1995-2014 Free Software Foundation, Inc. +# Copyright (C) 1995-2013 Free Software Foundation, Inc. # written by Ulrich Drepper <[email protected]>, June 1995 # # This program is free software; you can redistribute it and/or modify @@ -74,10 +74,6 @@ export LC_ALL LC_TIME=C export LC_TIME -# Use UTC to get reproducible result -TZ=UTC -export TZ - # GNU ls changes its time format in response to the TIME_STYLE # variable. Since we cannot assume 'unset' works, revert this # variable to its documented default. diff --git a/build-aux/missing b/build-aux/missing index f62bbae..db98974 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/test-driver b/build-aux/test-driver index 8e575b0..d306056 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,14 +106,11 @@ trap "st=143; $do_exit" 15 # Test script is run here. "$@" >$log_file 2>&1 estatus=$? - if test $enable_hard_errors = no && test $estatus -eq 99; then - tweaked_estatus=1 -else - tweaked_estatus=$estatus + estatus=1 fi -case $tweaked_estatus:$expect_failure in +case $estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -122,12 +119,6 @@ case $tweaked_estatus:$expect_failure in *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac -# Report the test outcome and exit status in the logs, so that one can -# know whether the test passed or failed simply by looking at the '.log' -# file, without the need of also peaking into the corresponding '.trs' -# file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file - # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/configure b/configure index 8f70834..9963749 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Mach 1.6. +# Generated by GNU Autoconf 2.69 for GNU Mach 1.6+git20151211. # # Report bugs to <[email protected]>. # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Mach' PACKAGE_TARNAME='gnumach' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='GNU Mach 1.6' +PACKAGE_VERSION='1.6+git20151211' +PACKAGE_STRING='GNU Mach 1.6+git20151211' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1595,7 +1595,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Mach 1.6 to adapt to many kinds of systems. +\`configure' configures GNU Mach 1.6+git20151211 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1666,7 +1666,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Mach 1.6:";; + short | recursive ) echo "Configuration of GNU Mach 1.6+git20151211:";; esac cat <<\_ACEOF @@ -2014,7 +2014,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Mach configure 1.6 +GNU Mach configure 1.6+git20151211 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2106,7 +2106,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Mach $as_me 1.6, which was +It was created by GNU Mach $as_me 1.6+git20151211, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2972,7 +2972,7 @@ fi # Define the identity of the package. PACKAGE='gnumach' - VERSION='1.6' + VERSION='1.6+git20151211' # Some tools Automake needs. @@ -12128,7 +12128,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Mach $as_me 1.6, which was +This file was extended by GNU Mach $as_me 1.6+git20151211, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12199,7 +12199,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Mach config.status 1.6 +GNU Mach config.status 1.6+git20151211 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/doc/mach.info b/doc/mach.info index a6d817b..f031e8c 100644 --- a/doc/mach.info +++ b/doc/mach.info @@ -2,8 +2,8 @@ This is mach.info, produced by makeinfo version 6.0 from mach.texi. This file documents the GNU Mach microkernel. - This is edition 0.4, last updated on 30 October 2015, of 'The GNU -Mach Reference Manual', for version 1.6. + This is edition 0.4, last updated on 12 September 2015, of 'The GNU +Mach Reference Manual', for version 1.6+git20151211. Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -39,126 +39,126 @@ END-INFO-DIR-ENTRY Indirect: -mach.info-1: 1629 -mach.info-2: 302528 +mach.info-1: 1643 +mach.info-2: 302570 Tag Table: (Indirect) -Node: Top1629 -Node: Introduction11256 -Node: Audience12087 -Node: Features13122 -Node: Overview14949 -Node: History16142 -Node: Installing16287 -Node: Binary Distributions17512 -Node: Compilation18320 -Node: Configuration19553 -Node: Cross-Compilation35964 -Node: Bootstrap36745 -Ref: Bootstrap-Footnote-137188 -Node: Bootloader37425 -Ref: Bootloader-Footnote-138705 -Node: Modules38791 -Node: Inter Process Communication39618 -Node: Major Concepts40241 -Node: Messaging Interface44046 -Node: Mach Message Call44776 -Node: Message Format48091 -Node: Exchanging Port Rights59283 -Ref: Exchanging Port Rights-Footnote-164845 -Node: Memory65017 -Ref: Memory-Footnote-168111 -Node: Message Send68453 -Ref: Message Send-Footnote-175475 -Node: Message Receive75758 -Ref: Message Receive-Footnote-185410 -Node: Atomicity85691 -Node: Port Manipulation Interface88465 -Node: Port Creation90020 -Node: Port Destruction94809 -Node: Port Names97952 -Node: Port Rights102199 -Node: Ports and other Tasks105988 -Node: Receive Rights110081 -Node: Port Sets117012 -Node: Request Notifications119415 -Node: Inherited Ports124219 -Node: Virtual Memory Interface127903 -Node: Memory Allocation129156 -Node: Memory Deallocation131681 -Node: Data Transfer133145 -Node: Memory Attributes136671 -Node: Mapping Memory Objects146110 -Node: Memory Statistics149419 -Node: External Memory Management150993 -Node: Memory Object Server151698 -Node: Memory Object Creation154407 -Node: Memory Object Termination158413 -Node: Memory Objects and Data161352 -Node: Memory Object Locking178498 -Node: Memory Object Attributes184393 -Node: Default Memory Manager190230 -Node: Threads and Tasks195952 -Node: Thread Interface196289 -Node: Thread Creation197285 -Node: Thread Termination198402 -Node: Thread Information198873 -Node: Thread Settings204972 -Node: Thread Execution206206 -Node: Scheduling213499 -Node: Thread Priority213854 -Node: Hand-Off Scheduling216488 -Node: Scheduling Policy221613 -Node: Thread Special Ports222945 -Node: Exceptions225391 -Node: Task Interface226261 -Node: Task Creation227273 -Node: Task Termination228608 -Node: Task Information229210 -Node: Task Execution236112 -Node: Task Special Ports240525 -Node: Syscall Emulation244379 -Node: Profiling245610 -Node: Host Interface249373 -Node: Host Ports250358 -Node: Host Information252431 -Node: Host Time257814 -Node: Host Reboot260481 -Node: Processors and Processor Sets261033 -Node: Processor Set Interface262011 -Node: Processor Set Ports262778 -Node: Processor Set Access263608 -Node: Processor Set Creation265868 -Node: Processor Set Destruction266895 -Node: Tasks and Threads on Sets267816 -Node: Processor Set Priority272983 -Node: Processor Set Policy274273 -Node: Processor Set Info275887 -Node: Processor Interface279700 -Node: Hosted Processors280425 -Node: Processor Control281416 -Node: Processors and Sets282882 -Node: Processor Info284760 -Node: Device Interface287502 -Node: Device Reply Server289117 -Node: Device Open290409 -Node: Device Close292532 -Node: Device Read293111 -Node: Device Write296030 -Node: Device Map298835 -Node: Device Status299726 -Node: Device Filter302528 -Node: Kernel Debugger308275 -Node: Operation309002 -Node: Commands311979 -Node: Variables325764 -Node: Expressions327152 -Node: Copying328501 -Node: Documentation License347730 -Node: GNU Free Documentation License348319 -Node: CMU License370718 -Node: Concept Index371953 -Node: Function and Data Index375799 +Node: Top1643 +Node: Introduction11284 +Node: Audience12115 +Node: Features13150 +Node: Overview14977 +Node: History16170 +Node: Installing16315 +Node: Binary Distributions17540 +Node: Compilation18348 +Node: Configuration19581 +Node: Cross-Compilation35992 +Node: Bootstrap36773 +Ref: Bootstrap-Footnote-137216 +Node: Bootloader37453 +Ref: Bootloader-Footnote-138733 +Node: Modules38819 +Node: Inter Process Communication39646 +Node: Major Concepts40269 +Node: Messaging Interface44074 +Node: Mach Message Call44804 +Node: Message Format48119 +Node: Exchanging Port Rights59311 +Ref: Exchanging Port Rights-Footnote-164873 +Node: Memory65045 +Ref: Memory-Footnote-168139 +Node: Message Send68481 +Ref: Message Send-Footnote-175503 +Node: Message Receive75786 +Ref: Message Receive-Footnote-185438 +Node: Atomicity85719 +Node: Port Manipulation Interface88493 +Node: Port Creation90048 +Node: Port Destruction94837 +Node: Port Names97980 +Node: Port Rights102227 +Node: Ports and other Tasks106016 +Node: Receive Rights110109 +Node: Port Sets117040 +Node: Request Notifications119443 +Node: Inherited Ports124247 +Node: Virtual Memory Interface127931 +Node: Memory Allocation129184 +Node: Memory Deallocation131709 +Node: Data Transfer133173 +Node: Memory Attributes136699 +Node: Mapping Memory Objects146138 +Node: Memory Statistics149447 +Node: External Memory Management151021 +Node: Memory Object Server151726 +Node: Memory Object Creation154435 +Node: Memory Object Termination158441 +Node: Memory Objects and Data161380 +Node: Memory Object Locking178526 +Node: Memory Object Attributes184421 +Node: Default Memory Manager190258 +Node: Threads and Tasks195980 +Node: Thread Interface196317 +Node: Thread Creation197313 +Node: Thread Termination198430 +Node: Thread Information198901 +Node: Thread Settings205000 +Node: Thread Execution206234 +Node: Scheduling213527 +Node: Thread Priority213882 +Node: Hand-Off Scheduling216516 +Node: Scheduling Policy221641 +Node: Thread Special Ports222973 +Node: Exceptions225419 +Node: Task Interface226289 +Node: Task Creation227301 +Node: Task Termination228636 +Node: Task Information229238 +Node: Task Execution236140 +Node: Task Special Ports240553 +Node: Syscall Emulation244407 +Node: Profiling245638 +Node: Host Interface249401 +Node: Host Ports250386 +Node: Host Information252459 +Node: Host Time257842 +Node: Host Reboot260509 +Node: Processors and Processor Sets261061 +Node: Processor Set Interface262039 +Node: Processor Set Ports262806 +Node: Processor Set Access263636 +Node: Processor Set Creation265896 +Node: Processor Set Destruction266923 +Node: Tasks and Threads on Sets267844 +Node: Processor Set Priority273011 +Node: Processor Set Policy274301 +Node: Processor Set Info275915 +Node: Processor Interface279728 +Node: Hosted Processors280453 +Node: Processor Control281444 +Node: Processors and Sets282910 +Node: Processor Info284788 +Node: Device Interface287530 +Node: Device Reply Server289145 +Node: Device Open290437 +Node: Device Close292560 +Node: Device Read293139 +Node: Device Write296058 +Node: Device Map298863 +Node: Device Status299754 +Node: Device Filter302570 +Node: Kernel Debugger308317 +Node: Operation309044 +Node: Commands312021 +Node: Variables325806 +Node: Expressions327194 +Node: Copying328543 +Node: Documentation License347772 +Node: GNU Free Documentation License348361 +Node: CMU License370760 +Node: Concept Index371995 +Node: Function and Data Index375841 End Tag Table diff --git a/doc/mach.info-1 b/doc/mach.info-1 index 9c8a62f..7a9fc50 100644 --- a/doc/mach.info-1 +++ b/doc/mach.info-1 @@ -2,8 +2,8 @@ This is mach.info, produced by makeinfo version 6.0 from mach.texi. This file documents the GNU Mach microkernel. - This is edition 0.4, last updated on 30 October 2015, of 'The GNU -Mach Reference Manual', for version 1.6. + This is edition 0.4, last updated on 12 September 2015, of 'The GNU +Mach Reference Manual', for version 1.6+git20151211. Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -45,8 +45,8 @@ Main Menu This file documents the GNU Mach microkernel. - This is edition 0.4, last updated on 30 October 2015, of 'The GNU -Mach Reference Manual', for version 1.6. + This is edition 0.4, last updated on 12 September 2015, of 'The GNU +Mach Reference Manual', for version 1.6+git20151211. Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc. diff --git a/doc/mach.info-2 b/doc/mach.info-2 index 77f3fee..0f3a6f8 100644 --- a/doc/mach.info-2 +++ b/doc/mach.info-2 @@ -2,8 +2,8 @@ This is mach.info, produced by makeinfo version 6.0 from mach.texi. This file documents the GNU Mach microkernel. - This is edition 0.4, last updated on 30 October 2015, of 'The GNU -Mach Reference Manual', for version 1.6. + This is edition 0.4, last updated on 12 September 2015, of 'The GNU +Mach Reference Manual', for version 1.6+git20151211. Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc. diff --git a/doc/stamp-vti b/doc/stamp-vti index bf58005..9c241d5 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 30 October 2015 -@set UPDATED-MONTH October 2015 -@set EDITION 1.6 -@set VERSION 1.6 +@set UPDATED 12 September 2015 +@set UPDATED-MONTH September 2015 +@set EDITION 1.6+git20151211 +@set VERSION 1.6+git20151211 diff --git a/doc/version.texi b/doc/version.texi index bf58005..9c241d5 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 30 October 2015 -@set UPDATED-MONTH October 2015 -@set EDITION 1.6 -@set VERSION 1.6 +@set UPDATED 12 September 2015 +@set UPDATED-MONTH September 2015 +@set EDITION 1.6+git20151211 +@set VERSION 1.6+git20151211 diff --git a/i386/i386/locore.S b/i386/i386/locore.S index cfda86f..8cefbcc 100644 --- a/i386/i386/locore.S +++ b/i386/i386/locore.S @@ -1183,6 +1183,8 @@ ENTRY(discover_x86_cpu_type) movl %esp,%ebp /* Save stack pointer */ and $~0x3,%esp /* Align stack pointer */ +#if 0 +/* Seems to hang with kvm linux 4.3.0 */ #ifdef MACH_HYP #warning Assuming not Cyrix CPU #else /* MACH_HYP */ @@ -1190,6 +1192,7 @@ ENTRY(discover_x86_cpu_type) andb $0x80,%al /* ... in CCR4 reg bit7 */ outb %al,$0xe8 #endif /* MACH_HYP */ +#endif pushfl /* Fetch flags ... */ popl %eax /* ... into eax */ diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c index 5c16b15..edeef9f 100644 --- a/i386/i386at/lpr.c +++ b/i386/i386at/lpr.c @@ -70,7 +70,7 @@ struct bus_ctlr *dev; int unit = dev->unit; int ret; - if ((unit < 0) || (unit > NLPR)) { + if ((unit < 0) || (unit >= NLPR)) { printf("com %d out of range\n", unit); return(0); } diff --git a/linux/dev/drivers/block/ahci.c b/linux/dev/drivers/block/ahci.c index 9bb2e6b..c243982 100644 --- a/linux/dev/drivers/block/ahci.c +++ b/linux/dev/drivers/block/ahci.c @@ -381,7 +381,7 @@ static void ahci_do_request() /* invoked with cli() */ minor = MINOR(rq->rq_dev); unit = minor >> PARTN_BITS; - if (unit > MAX_PORTS) { + if (unit >= MAX_PORTS) { printk("bad ahci unit %u\n", unit); goto kill_rq; } @@ -899,7 +899,7 @@ static void ahci_probe_dev(unsigned char bus, unsigned char device) /* Present and communication established */ break; case 0x4: - printk("ahci: %02u:%02u.%u: Phy offline?!\n", bus, dev, fun, i); + printk("ahci: %02u:%02u.%u: Port %u phy offline?!\n", bus, dev, fun, i); continue; default: printk("ahci: %02u:%02u.%u: Unknown port %u SPD %x\n", bus, dev, fun, i, spd); diff --git a/version.m4 b/version.m4 index ef5ee1e..277c530 100644 --- a/version.m4 +++ b/version.m4 @@ -1,4 +1,4 @@ m4_define([AC_PACKAGE_NAME],[GNU Mach]) -m4_define([AC_PACKAGE_VERSION],[1.6]) +m4_define([AC_PACKAGE_VERSION],[1.6+git20151211]) m4_define([AC_PACKAGE_BUGREPORT],[[email protected]]) m4_define([AC_PACKAGE_TARNAME],[gnumach]) diff --git a/vm/vm_map.c b/vm/vm_map.c index ae3ce21..cded22d 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -1519,8 +1519,10 @@ kern_return_t vm_map_pageable_common( (entry->vme_end > start)) { if (user_wire) { if (--(entry->user_wired_count) == 0) + { map->user_wired -= entry->vme_end - entry->vme_start; entry->wired_count--; + } } else { entry->wired_count--; diff --git a/vm/vm_object.c b/vm/vm_object.c index 133181f..dd63481 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -228,6 +228,8 @@ vm_object_t _vm_object_allocate( vm_object_t object; object = (vm_object_t) kmem_cache_alloc(&vm_object_cache); + if (!object) + return 0; _vm_object_setup(object, size); @@ -241,6 +243,8 @@ vm_object_t vm_object_allocate( ipc_port_t port; object = _vm_object_allocate(size); + if (object == 0) + panic("vm_object_allocate"); port = ipc_port_alloc_kernel(); if (port == IP_NULL) panic("vm_object_allocate"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/gnumach.git
