PERFORCE change 107289 for review
Kip Macy
kmacy at FreeBSD.org
Wed Oct 4 19:06:46 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107289
Change 107289 by kmacy at kmacy_storage:sun4v_work_stable on 2006/10/05 02:05:59
IFC
Affected files ...
.. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/configure.ac#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/add.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/label.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/remove.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/kqueue.9#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/elf.h#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files#6 edit
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-lowlevel.c#3 edit
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-queue.c#4 edit
.. //depot/projects/kmacy_sun4v_stable/src/sys/i386/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf32.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf64.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf_common.h#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/sys/signalvar.h#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/tools/tools/tinybsd/tinybsd#2 integrate
Differences ...
==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/configure.ac#3 (text+ko) ====
@@ -1,5 +1,4 @@
-# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $
-# $FreeBSD: src/crypto/openssh/configure.ac,v 1.14 2006/09/30 13:38:04 des Exp $
+# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -16,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev at mindrot.org)
-AC_REVISION($Revision: 1.367 $)
+AC_REVISION($Revision: 1.369 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -128,6 +127,136 @@
]
)
+# Allow user to specify flags
+AC_ARG_WITH(cflags,
+ [ --with-cflags Specify additional flags to pass to compiler],
+ [
+ if test -n "$withval" && test "x$withval" != "xno" && \
+ test "x${withval}" != "xyes"; then
+ CFLAGS="$CFLAGS $withval"
+ fi
+ ]
+)
+AC_ARG_WITH(cppflags,
+ [ --with-cppflags Specify additional flags to pass to preprocessor] ,
+ [
+ if test -n "$withval" && test "x$withval" != "xno" && \
+ test "x${withval}" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS $withval"
+ fi
+ ]
+)
+AC_ARG_WITH(ldflags,
+ [ --with-ldflags Specify additional flags to pass to linker],
+ [
+ if test -n "$withval" && test "x$withval" != "xno" && \
+ test "x${withval}" != "xyes"; then
+ LDFLAGS="$LDFLAGS $withval"
+ fi
+ ]
+)
+AC_ARG_WITH(libs,
+ [ --with-libs Specify additional libraries to link with],
+ [
+ if test -n "$withval" && test "x$withval" != "xno" && \
+ test "x${withval}" != "xyes"; then
+ LIBS="$LIBS $withval"
+ fi
+ ]
+)
+AC_ARG_WITH(Werror,
+ [ --with-Werror Build main code with -Werror],
+ [
+ if test -n "$withval" && test "x$withval" != "xno"; then
+ werror_flags="-Werror"
+ if test "x${withval}" != "xyes"; then
+ werror_flags="$withval"
+ fi
+ fi
+ ]
+)
+
+AC_CHECK_HEADERS( \
+ bstring.h \
+ crypt.h \
+ crypto/sha2.h \
+ dirent.h \
+ endian.h \
+ features.h \
+ fcntl.h \
+ floatingpoint.h \
+ getopt.h \
+ glob.h \
+ ia.h \
+ iaf.h \
+ limits.h \
+ login.h \
+ maillock.h \
+ ndir.h \
+ net/if_tun.h \
+ netdb.h \
+ netgroup.h \
+ pam/pam_appl.h \
+ paths.h \
+ pty.h \
+ readpassphrase.h \
+ rpc/types.h \
+ security/pam_appl.h \
+ sha2.h \
+ shadow.h \
+ stddef.h \
+ stdint.h \
+ string.h \
+ strings.h \
+ sys/audit.h \
+ sys/bitypes.h \
+ sys/bsdtty.h \
+ sys/cdefs.h \
+ sys/dir.h \
+ sys/mman.h \
+ sys/ndir.h \
+ sys/prctl.h \
+ sys/pstat.h \
+ sys/select.h \
+ sys/stat.h \
+ sys/stream.h \
+ sys/stropts.h \
+ sys/strtio.h \
+ sys/sysmacros.h \
+ sys/time.h \
+ sys/timers.h \
+ sys/un.h \
+ time.h \
+ tmpdir.h \
+ ttyent.h \
+ unistd.h \
+ usersec.h \
+ util.h \
+ utime.h \
+ utmp.h \
+ utmpx.h \
+ vis.h \
+)
+
+# lastlog.h requires sys/time.h to be included first on Solaris
+AC_CHECK_HEADERS(lastlog.h, [], [], [
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+])
+
+# sys/ptms.h requires sys/stream.h to be included first on Solaris
+AC_CHECK_HEADERS(sys/ptms.h, [], [], [
+#ifdef HAVE_SYS_STREAM_H
+# include <sys/stream.h>
+#endif
+])
+
+# login_cap.h requires sys/types.h on NetBSD
+AC_CHECK_HEADERS(login_cap.h, [], [], [
+#include <sys/types.h>
+])
+
# Messages for features tested for in target-specific section
SIA_MSG="no"
SPC_MSG="no"
@@ -664,55 +793,6 @@
;;
esac
-# Allow user to specify flags
-AC_ARG_WITH(cflags,
- [ --with-cflags Specify additional flags to pass to compiler],
- [
- if test -n "$withval" && test "x$withval" != "xno" && \
- test "x${withval}" != "xyes"; then
- CFLAGS="$CFLAGS $withval"
- fi
- ]
-)
-AC_ARG_WITH(cppflags,
- [ --with-cppflags Specify additional flags to pass to preprocessor] ,
- [
- if test -n "$withval" && test "x$withval" != "xno" && \
- test "x${withval}" != "xyes"; then
- CPPFLAGS="$CPPFLAGS $withval"
- fi
- ]
-)
-AC_ARG_WITH(ldflags,
- [ --with-ldflags Specify additional flags to pass to linker],
- [
- if test -n "$withval" && test "x$withval" != "xno" && \
- test "x${withval}" != "xyes"; then
- LDFLAGS="$LDFLAGS $withval"
- fi
- ]
-)
-AC_ARG_WITH(libs,
- [ --with-libs Specify additional libraries to link with],
- [
- if test -n "$withval" && test "x$withval" != "xno" && \
- test "x${withval}" != "xyes"; then
- LIBS="$LIBS $withval"
- fi
- ]
-)
-AC_ARG_WITH(Werror,
- [ --with-Werror Build main code with -Werror],
- [
- if test -n "$withval" && test "x$withval" != "xno"; then
- werror_flags="-Werror"
- if test "x${withval}" != "xyes"; then
- werror_flags="$withval"
- fi
- fi
- ]
-)
-
AC_MSG_CHECKING(compiler and flags for sanity)
AC_RUN_IFELSE(
[AC_LANG_SOURCE([
@@ -728,87 +808,6 @@
)
dnl Checks for header files.
-AC_CHECK_HEADERS( \
- bstring.h \
- crypt.h \
- crypto/sha2.h \
- dirent.h \
- endian.h \
- features.h \
- fcntl.h \
- floatingpoint.h \
- getopt.h \
- glob.h \
- ia.h \
- iaf.h \
- limits.h \
- login.h \
- maillock.h \
- ndir.h \
- net/if_tun.h \
- netdb.h \
- netgroup.h \
- pam/pam_appl.h \
- paths.h \
- pty.h \
- readpassphrase.h \
- rpc/types.h \
- security/pam_appl.h \
- sha2.h \
- shadow.h \
- stddef.h \
- stdint.h \
- string.h \
- strings.h \
- sys/audit.h \
- sys/bitypes.h \
- sys/bsdtty.h \
- sys/cdefs.h \
- sys/dir.h \
- sys/mman.h \
- sys/ndir.h \
- sys/prctl.h \
- sys/pstat.h \
- sys/select.h \
- sys/stat.h \
- sys/stream.h \
- sys/stropts.h \
- sys/strtio.h \
- sys/sysmacros.h \
- sys/time.h \
- sys/timers.h \
- sys/un.h \
- time.h \
- tmpdir.h \
- ttyent.h \
- unistd.h \
- usersec.h \
- util.h \
- utime.h \
- utmp.h \
- utmpx.h \
- vis.h \
-)
-
-# lastlog.h requires sys/time.h to be included first on Solaris
-AC_CHECK_HEADERS(lastlog.h, [], [], [
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-])
-
-# sys/ptms.h requires sys/stream.h to be included first on Solaris
-AC_CHECK_HEADERS(sys/ptms.h, [], [], [
-#ifdef HAVE_SYS_STREAM_H
-# include <sys/stream.h>
-#endif
-])
-
-# login_cap.h requires sys/types.h on NetBSD
-AC_CHECK_HEADERS(login_cap.h, [], [], [
-#include <sys/types.h>
-])
-
# Checks for libraries.
AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
@@ -1952,7 +1951,7 @@
AC_TRY_COMPILE(
[ #include <openssl/engine.h>],
[
-int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();}
+ENGINE_load_builtin_engines();ENGINE_register_all_complete();
],
[ AC_MSG_RESULT(yes)
AC_DEFINE(USE_OPENSSL_ENGINE, 1,
==== //depot/projects/kmacy_sun4v_stable/src/include/elf.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $
+ * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $
*/
/*
@@ -38,4 +38,8 @@
#include <sys/elf32.h>
#include <sys/elf64.h>
+#ifdef _SOLARIS_C_SOURCE
+#include <sys/_elf_solaris.h>
+#endif
+
#endif /* !_ELF_H_ */
==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/add.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $");
#include <sys/types.h>
@@ -163,7 +163,7 @@
case 'b':
if (block > 0)
usage_add();
- block = strtol(optarg, &p, 10);
+ block = strtoll(optarg, &p, 10);
if (*p != 0 || block < 1)
usage_add();
break;
@@ -177,7 +177,7 @@
case 's':
if (size > 0)
usage_add();
- size = strtol(optarg, &p, 10);
+ size = strtoll(optarg, &p, 10);
if (*p != 0 || size < 1)
usage_add();
break;
==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/label.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.2 2006/06/22 22:05:28 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
#include <sys/types.h>
@@ -184,7 +184,7 @@
case 'b':
if (block > 0)
usage_label();
- block = strtol(optarg, &p, 10);
+ block = strtoll(optarg, &p, 10);
if (*p != 0 || block < 1)
usage_label();
break;
@@ -208,7 +208,7 @@
case 's':
if (size > 0)
usage_label();
- size = strtol(optarg, &p, 10);
+ size = strtoll(optarg, &p, 10);
if (*p != 0 || size < 1)
usage_label();
break;
==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/remove.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.9 2006/06/22 22:05:28 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#include <sys/types.h>
@@ -155,7 +155,7 @@
case 'b':
if (block > 0)
usage_remove();
- block = strtol(optarg, &p, 10);
+ block = strtoll(optarg, &p, 10);
if (*p != 0 || block < 1)
usage_remove();
break;
@@ -169,7 +169,7 @@
case 's':
if (size > 0)
usage_remove();
- size = strtol(optarg, &p, 10);
+ size = strtoll(optarg, &p, 10);
if (*p != 0 || size < 1)
usage_remove();
break;
==== //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#6 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.195 2006/09/18 11:55:10 ru Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.196 2006/10/04 19:29:05 keramida Exp $
.\"
.Dd July 25, 2006
.Dt IPFW 8
@@ -951,20 +951,20 @@
.It Ar addr Ns / Ns Ar masklen
Matches all addresses with base
.Ar addr
-(specified as an IP address or a hostname)
+(specified as an IP address, a network number, or a hostname)
and mask width of
.Cm masklen
bits.
-As an example, 1.2.3.4/25 will match
+As an example, 1.2.3.4/25 or 1.2.3.0/25 will match
all IP numbers from 1.2.3.0 to 1.2.3.127 .
.It Ar addr Ns : Ns Ar mask
Matches all addresses with base
.Ar addr
-(specified as an IP address or a hostname)
+(specified as an IP address, a network number, or a hostname)
and the mask of
.Ar mask ,
specified as a dotted quad.
-As an example, 1.2.3.4:255.0.255.0 will match
+As an example, 1.2.3.4:255.0.255.0 or 1.0.3.0:255.0.255.0 will match
1.*.3.*.
This form is advised only for non-contiguous
masks.
@@ -977,7 +977,7 @@
.It Ar list : Bro Ar num | num-num Brc Ns Op Ns , Ns Ar list
Matches all addresses with base address
.Ar addr
-(specified as an IP address or a hostname)
+(specified as an IP address, a network number, or a hostname)
and whose last byte is in the list between braces { } .
Note that there must be no spaces between braces and
numbers (spaces after commas are allowed).
@@ -997,6 +997,7 @@
the complexity of rulesets.
.br
As an example, an address specified as 1.2.3.4/24{128,35-55,89}
+or 1.2.3.0/24{128,35-55,89}
will match the following IP addresses:
.br
1.2.3.128, 1.2.3.35 to 1.2.3.55, 1.2.3.89 .
==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.280 2006/10/04 20:16:23 jmg Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -129,6 +129,7 @@
kernacc.9 \
kernel_mount.9 \
kobj.9 \
+ kqueue.9 \
kthread.9 \
ktr.9 \
lock.9 \
@@ -665,6 +666,20 @@
kobj.9 kobj_create.9 \
kobj.9 kobj_delete.9 \
kobj.9 kobj_init.9
+MLINKS+=kqueue.9 kqfd_register.9 \
+ kqueue.9 knlist_add.9 \
+ kqueue.9 knlist_remove.9 \
+ kqueue.9 knlist_remove_inevent.9 \
+ kqueue.9 knlist_empty.9 \
+ kqueue.9 knlist_init.9 \
+ kqueue.9 knlist_destroy.9 \
+ kqueue.9 knlist_clear.9 \
+ kqueue.9 knlist_delete.9 \
+ kqueue.9 knote_fdclose.9 \
+ kqueue.9 KNOTE_LOCKED.9 \
+ kqueue.9 KNOTE_UNLOCKED.9 \
+ kqueue.9 kqueue_add_filteropts.9 \
+ kqueue.9 kqueue_del_filteropts.9
MLINKS+=kthread.9 kproc_shutdown.9 \
kthread.9 kproc_start.9 \
kthread.9 kthread_create.9 \
==== //depot/projects/kmacy_sun4v_stable/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $");
#include "opt_compat.h"
@@ -67,6 +67,7 @@
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
+#include <compat/freebsd32/freebsd32_signal.h>
#include <compat/freebsd32/freebsd32_util.h>
#include <compat/freebsd32/freebsd32_proto.h>
#include <compat/ia32/ia32_signal.h>
@@ -298,7 +299,7 @@
freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
{
struct ia32_sigframe4 sf, *sfp;
- struct ia32_siginfo siginfo;
+ struct siginfo32 siginfo;
struct proc *p;
struct thread *td;
struct sigacts *psp;
@@ -308,7 +309,7 @@
td = curthread;
p = td->td_proc;
- siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo);
+ siginfo_to_siginfo32(&ksi->ksi_info, &siginfo);
PROC_LOCK_ASSERT(p, MA_OWNED);
sig = siginfo.si_signo;
@@ -407,7 +408,7 @@
ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
{
struct ia32_sigframe sf, *sfp;
- struct ia32_siginfo siginfo;
+ struct siginfo32 siginfo;
struct proc *p;
struct thread *td;
struct sigacts *psp;
@@ -416,7 +417,7 @@
int oonstack;
int sig;
- siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo);
+ siginfo_to_siginfo32(&ksi->ksi_info, &siginfo);
td = curthread;
p = td->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
@@ -741,20 +742,3 @@
pcb->pcb_flags |= PCB_FULLCTX;
td->td_retval[1] = 0;
}
-
-void
-siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst)
-{
- dst->si_signo = src->si_signo;
- dst->si_errno = src->si_errno;
- dst->si_code = src->si_code;
- dst->si_pid = src->si_pid;
- dst->si_uid = src->si_uid;
- dst->si_status = src->si_status;
- dst->si_addr = dst->si_addr;
- dst->si_value.sigval_int = src->si_value.sival_int;
- dst->si_band = src->si_band;
- dst->si_trapno = src->si_trapno;
- dst->si_timerid = src->si_timerid;
- dst->si_overrun = src->si_overrun;
-}
==== //depot/projects/kmacy_sun4v_stable/src/sys/amd64/include/elf.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -108,31 +108,6 @@
* Relocation types.
*/
-#define R_X86_64_NONE 0 /* No relocation. */
-#define R_X86_64_64 1 /* Add 64 bit symbol value. */
-#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */
-#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */
-#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */
-#define R_X86_64_COPY 5 /* Copy data from shared object. */
-#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */
-#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */
-#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */
-#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */
-#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */
-#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */
-#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */
-#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */
-#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */
-#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */
-#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */
-#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */
-#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */
-#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */
-#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */
-#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */
-#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */
-#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */
-
#define R_X86_64_COUNT 24 /* Count of defined relocation types. */
/* Define "machine" characteristics */
==== //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/elf.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $
*/
#ifndef _MACHINE_ELF_H_
@@ -82,40 +82,6 @@
#define AT_COUNT 15 /* Count of defined aux entry types. */
-#define R_ARM_NONE 0 /* No relocation. */
-#define R_ARM_PC24 1
-#define R_ARM_ABS32 2
-#define R_ARM_REL32 3
-#define R_ARM_PC13 4
-#define R_ARM_ABS16 5
-#define R_ARM_ABS12 6
-#define R_ARM_THM_ABS5 7
-#define R_ARM_ABS8 8
-#define R_ARM_SBREL32 9
-#define R_ARM_THM_PC22 10
-#define R_ARM_THM_PC8 11
-#define R_ARM_AMP_VCALL9 12
-#define R_ARM_SWI24 13
-#define R_ARM_THM_SWI8 14
-#define R_ARM_XPC25 15
-#define R_ARM_THM_XPC22 16
-#define R_ARM_COPY 20 /* Copy data from shared object. */
-#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */
-#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */
-#define R_ARM_RELATIVE 23 /* Add load address of shared object. */
-#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */
-#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */
-#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */
-#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */
-#define R_ARM_GNU_VTENTRY 100
-#define R_ARM_GNU_VTINHERIT 101
-#define R_ARM_RSBREL32 250
-#define R_ARM_THM_RPC22 251
-#define R_ARM_RREL32 252
-#define R_ARM_RABS32 253
-#define R_ARM_RPC24 254
-#define R_ARM_RBASE 255
-
#define R_ARM_COUNT 33 /* Count of defined relocation types. */
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.61 2006/10/05 01:56:10 davidxu Exp $");
#include "opt_compat.h"
@@ -88,6 +88,7 @@
#include <compat/freebsd32/freebsd32_util.h>
#include <compat/freebsd32/freebsd32.h>
+#include <compat/freebsd32/freebsd32_signal.h>
#include <compat/freebsd32/freebsd32_proto.h>
CTASSERT(sizeof(struct timeval32) == 8);
@@ -192,12 +193,6 @@
}
#endif
-struct sigaltstack32 {
- u_int32_t ss_sp;
- u_int32_t ss_size;
- int ss_flags;
-};
-
CTASSERT(sizeof(struct sigaltstack32) == 12);
int
@@ -2178,6 +2173,89 @@
return (kern_thr_suspend(td, tsp));
}
+void
+siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst)
+{
+ bzero(dst, sizeof(*dst));
+ dst->si_signo = src->si_signo;
+ dst->si_errno = src->si_errno;
+ dst->si_code = src->si_code;
+ dst->si_pid = src->si_pid;
+ dst->si_uid = src->si_uid;
+ dst->si_status = src->si_status;
+ dst->si_addr = dst->si_addr;
+ dst->si_value.sigval_int = src->si_value.sival_int;
+ dst->si_timerid = src->si_timerid;
+ dst->si_overrun = src->si_overrun;
+}
+
+int
+freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *uap)
+{
+ struct timespec32 ts32;
+ struct timespec ts;
+ struct timespec *timeout;
+ sigset_t set;
+ ksiginfo_t ksi;
+ struct siginfo32 si32;
+ int error;
+
+ if (uap->timeout) {
+ error = copyin(uap->timeout, &ts32, sizeof(ts32));
+ if (error)
+ return (error);
+ ts.tv_sec = ts32.tv_sec;
+ ts.tv_nsec = ts32.tv_nsec;
+ timeout = &ts;
+ } else
+ timeout = NULL;
+
+ error = copyin(uap->set, &set, sizeof(set));
+ if (error)
+ return (error);
+
+ error = kern_sigtimedwait(td, set, &ksi, timeout);
+ if (error)
+ return (error);
+
+ if (uap->info) {
+ siginfo_to_siginfo32(&ksi.ksi_info, &si32);
+ error = copyout(&si32, uap->info, sizeof(struct siginfo32));
+ }
+
+ if (error == 0)
+ td->td_retval[0] = ksi.ksi_signo;
+ return (error);
+}
+
+/*
+ * MPSAFE
+ */
+int
+freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap)
+{
+ ksiginfo_t ksi;
+ struct siginfo32 si32;
+ sigset_t set;
+ int error;
+
+ error = copyin(uap->set, &set, sizeof(set));
+ if (error)
+ return (error);
+
+ error = kern_sigtimedwait(td, set, &ksi, NULL);
+ if (error)
+ return (error);
+
+ if (uap->info) {
+ siginfo_to_siginfo32(&ksi.ksi_info, &si32);
+ error = copyout(&si32, uap->info, sizeof(struct siginfo32));
+ }
+ if (error == 0)
+ td->td_retval[0] = ksi.ksi_signo;
+ return (error);
+}
+
#if 0
int
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.68 2006/10/05 01:58:56 davidxu Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -244,6 +244,15 @@
char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)];
};
+struct freebsd32_sigtimedwait_args {
+ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
+ char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
+ char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
+};
+struct freebsd32_sigwaitinfo_args {
+ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
+ char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
+};
struct freebsd32_kevent_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)];
@@ -333,6 +342,8 @@
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *);
+int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
+int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *);
int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *);
@@ -471,6 +482,8 @@
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT
+#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.66 2006/10/05 01:58:57 davidxu Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp
*/
#define FREEBSD32_SYS_syscall 0
@@ -260,6 +260,8 @@
/* 342 is old freebsd32_sigaction */
#define FREEBSD32_SYS_sigpending 343
/* 344 is old freebsd32_sigreturn */
+#define FREEBSD32_SYS_freebsd32_sigtimedwait 345
+#define FREEBSD32_SYS_freebsd32_sigwaitinfo 346
#define FREEBSD32_SYS___acl_get_file 347
#define FREEBSD32_SYS___acl_set_file 348
#define FREEBSD32_SYS___acl_get_fd 349
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.57 2006/10/05 01:58:57 davidxu Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp
*/
const char *freebsd32_syscallnames[] = {
@@ -352,8 +352,8 @@
"old.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */
"sigpending", /* 343 = sigpending */
"old.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */
- "#345", /* 345 = sigtimedwait */
- "#346", /* 346 = sigwaitinfo */
+ "freebsd32_sigtimedwait", /* 345 = freebsd32_sigtimedwait */
+ "freebsd32_sigwaitinfo", /* 346 = freebsd32_sigwaitinfo */
"__acl_get_file", /* 347 = __acl_get_file */
"__acl_set_file", /* 348 = __acl_set_file */
"__acl_get_fd", /* 349 = __acl_get_fd */
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.67 2006/10/05 01:58:57 davidxu Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp
*/
#include "opt_compat.h"
@@ -377,8 +377,8 @@
{ compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 342 = old freebsd32_sigaction */
{ AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0 }, /* 343 = sigpending */
{ compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 345 = sigtimedwait */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */
+ { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 345 = freebsd32_sigtimedwait */
+ { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0 }, /* 346 = freebsd32_sigwaitinfo */
{ AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */
{ AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */
{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#7 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -578,10 +578,11 @@
343 AUE_SIGPENDING NOPROTO { int sigpending(sigset_t *set); }
344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \
const struct freebsd4_freebsd32_ucontext *sigcntxp); }
-; XXX implement
-345 AUE_SIGWAIT UNIMPL sigtimedwait
-; XXX implement
-346 AUE_NULL UNIMPL sigwaitinfo
+345 AUE_SIGWAIT STD { int freebsd32_sigtimedwait(const sigset_t *set, \
+ siginfo_t *info, \
+ const struct timespec *timeout); }
+346 AUE_NULL STD { int freebsd32_sigwaitinfo(const sigset_t *set, \
+ siginfo_t *info); }
347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \
acl_type_t type, struct acl *aclp); }
348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \
==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_genassym.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list