svn commit: r215396 - in projects/binutils-2.17: contrib/top
gnu/usr.bin/binutils gnu/usr.bin/binutils/as
gnu/usr.bin/binutils/as/powerpc64-freebsd
gnu/usr.bin/binutils/libbfd gnu/usr.bin/binutils/...
Dimitry Andric
dim at FreeBSD.org
Tue Nov 16 10:33:42 UTC 2010
Author: dim
Date: Tue Nov 16 10:33:41 2010
New Revision: 215396
URL: http://svn.freebsd.org/changeset/base/215396
Log:
Sync: merge r215319 through r215395 from ^/head, so ports can actually
build! :)
Deleted:
projects/binutils-2.17/gnu/usr.bin/binutils/as/powerpc64-freebsd/
projects/binutils-2.17/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
projects/binutils-2.17/share/man/man8/MAKEDEV.8
Modified:
projects/binutils-2.17/gnu/usr.bin/binutils/Makefile.inc0
projects/binutils-2.17/gnu/usr.bin/binutils/as/Makefile
projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile
projects/binutils-2.17/lib/clang/clang.build.mk
projects/binutils-2.17/sbin/hastd/primary.c
projects/binutils-2.17/share/doc/papers/jail/mgt.ms
projects/binutils-2.17/share/doc/smm/01.setup/2.t
projects/binutils-2.17/share/doc/smm/01.setup/4.t
projects/binutils-2.17/share/doc/smm/01.setup/5.t
projects/binutils-2.17/share/doc/smm/01.setup/spell.ok
projects/binutils-2.17/share/man/man5/src.conf.5
projects/binutils-2.17/share/man/man8/Makefile
projects/binutils-2.17/sys/amd64/amd64/trap.c
projects/binutils-2.17/sys/arm/xscale/ixp425/avila_gpio.c
projects/binutils-2.17/sys/arm/xscale/ixp425/avila_led.c
projects/binutils-2.17/sys/arm/xscale/ixp425/cambria_gpio.c
projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425.c
projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425_iic.c
projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425var.h
projects/binutils-2.17/sys/boot/arm/uboot/ldscript.arm
projects/binutils-2.17/sys/boot/forth/beastie.4th
projects/binutils-2.17/sys/compat/linsysfs/linsysfs.c
projects/binutils-2.17/sys/compat/linux/linux_futex.c
projects/binutils-2.17/sys/compat/linux/linux_futex.h
projects/binutils-2.17/sys/dev/drm/drmP.h
projects/binutils-2.17/sys/dev/drm/drm_agpsupport.c
projects/binutils-2.17/sys/dev/drm/drm_drv.c
projects/binutils-2.17/sys/dev/drm/drm_memory.c
projects/binutils-2.17/sys/dev/drm/drm_sysctl.c
projects/binutils-2.17/sys/dev/drm/radeon_cs.c
projects/binutils-2.17/sys/dev/firewire/00README
projects/binutils-2.17/sys/dev/mii/brgphy.c
projects/binutils-2.17/sys/dev/mii/mii.c
projects/binutils-2.17/sys/dev/mpt/mpt.h
projects/binutils-2.17/sys/dev/nfe/if_nfe.c
projects/binutils-2.17/sys/dev/re/if_re.c
projects/binutils-2.17/sys/dev/tdfx/tdfx_pci.c
projects/binutils-2.17/sys/dev/usb/net/if_ruereg.h
projects/binutils-2.17/sys/dev/usb/serial/u3g.c
projects/binutils-2.17/sys/dev/usb/usbdevs
projects/binutils-2.17/sys/dev/xl/if_xl.c
projects/binutils-2.17/sys/i386/i386/trap.c
projects/binutils-2.17/sys/kern/kern_umtx.c
projects/binutils-2.17/sys/netinet/cc.h
projects/binutils-2.17/sys/netinet/cc/cc.c
projects/binutils-2.17/sys/netinet/tcp_subr.c
projects/binutils-2.17/sys/netinet/tcp_var.h
projects/binutils-2.17/sys/sparc64/pci/psycho.c
projects/binutils-2.17/sys/sparc64/pci/schizo.c
projects/binutils-2.17/sys/sys/param.h
projects/binutils-2.17/sys/vm/vm_mmap.c
projects/binutils-2.17/tools/build/mk/OptionalObsoleteFiles.inc
projects/binutils-2.17/usr.sbin/config/SMM.doc/6.t
projects/binutils-2.17/usr.sbin/config/SMM.doc/spell.ok
Directory Properties:
projects/binutils-2.17/ (props changed)
projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/contrib/bind9/ (props changed)
projects/binutils-2.17/contrib/binutils/ (props changed)
projects/binutils-2.17/contrib/bzip2/ (props changed)
projects/binutils-2.17/contrib/ee/ (props changed)
projects/binutils-2.17/contrib/expat/ (props changed)
projects/binutils-2.17/contrib/file/ (props changed)
projects/binutils-2.17/contrib/gdb/ (props changed)
projects/binutils-2.17/contrib/gdtoa/ (props changed)
projects/binutils-2.17/contrib/gnu-sort/ (props changed)
projects/binutils-2.17/contrib/groff/ (props changed)
projects/binutils-2.17/contrib/less/ (props changed)
projects/binutils-2.17/contrib/libpcap/ (props changed)
projects/binutils-2.17/contrib/llvm/ (props changed)
projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed)
projects/binutils-2.17/contrib/ncurses/ (props changed)
projects/binutils-2.17/contrib/netcat/ (props changed)
projects/binutils-2.17/contrib/ntp/ (props changed)
projects/binutils-2.17/contrib/one-true-awk/ (props changed)
projects/binutils-2.17/contrib/openbsm/ (props changed)
projects/binutils-2.17/contrib/openpam/ (props changed)
projects/binutils-2.17/contrib/pf/ (props changed)
projects/binutils-2.17/contrib/sendmail/ (props changed)
projects/binutils-2.17/contrib/tcpdump/ (props changed)
projects/binutils-2.17/contrib/tcsh/ (props changed)
projects/binutils-2.17/contrib/top/ (props changed)
projects/binutils-2.17/contrib/top/install-sh (props changed)
projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed)
projects/binutils-2.17/contrib/tzcode/zic/ (props changed)
projects/binutils-2.17/contrib/tzdata/ (props changed)
projects/binutils-2.17/contrib/wpa/ (props changed)
projects/binutils-2.17/contrib/xz/ (props changed)
projects/binutils-2.17/crypto/openssh/ (props changed)
projects/binutils-2.17/crypto/openssl/ (props changed)
projects/binutils-2.17/lib/libc/ (props changed)
projects/binutils-2.17/lib/libc/stdtime/ (props changed)
projects/binutils-2.17/lib/libutil/ (props changed)
projects/binutils-2.17/lib/libz/ (props changed)
projects/binutils-2.17/sbin/ (props changed)
projects/binutils-2.17/sbin/ipfw/ (props changed)
projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed)
projects/binutils-2.17/share/zoneinfo/ (props changed)
projects/binutils-2.17/sys/ (props changed)
projects/binutils-2.17/sys/amd64/include/xen/ (props changed)
projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed)
projects/binutils-2.17/sys/contrib/pf/ (props changed)
projects/binutils-2.17/sys/contrib/x86emu/ (props changed)
projects/binutils-2.17/sys/dev/xen/xenpci/ (props changed)
projects/binutils-2.17/usr.bin/calendar/ (props changed)
projects/binutils-2.17/usr.bin/csup/ (props changed)
projects/binutils-2.17/usr.bin/procstat/ (props changed)
projects/binutils-2.17/usr.sbin/zic/ (props changed)
Modified: projects/binutils-2.17/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/Makefile.inc0 Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/Makefile.inc0 Tue Nov 16 10:33:41 2010 (r215396)
@@ -38,28 +38,15 @@ CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64
.endif
CFLAGS+= -I.
-.if exists(${.CURDIR}/${TARGET_CPUARCH})
-CFLAGS+= -I${.CURDIR}/${TARGET_CPUARCH}
-.endif
CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd
CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd
CFLAGS+= -I${SRCDIR}/include
-.if exists(${.CURDIR}/${TARGET_CPUARCH})
-.PATH: ${.CURDIR}/${TARGET_CPUARCH}
-.endif
-
ARCHS= ${TARGET_CPUARCH}
-.for _arch in ${CROSS_ARCH}
-.if (${ARCHS:R:M${_arch:R}} == "")
-ARCHS+= $(_arch)
-.endif
-.endfor
-
-.for _arch in ${ARCHS}
-.if exists(${.CURDIR}/Makefile.${_arch})
-.include "${.CURDIR}/Makefile.${_arch}"
+.if exists(${.CURDIR}/Makefile.${TARGET_ARCH})
+.include "${.CURDIR}/Makefile.${TARGET_ARCH}"
+.elif exists(${.CURDIR}/Makefile.${TARGET_CPUARCH})
+.include "${.CURDIR}/Makefile.${TARGET_CPUARCH}"
.endif
-.endfor
Modified: projects/binutils-2.17/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/as/Makefile Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/as/Makefile Tue Nov 16 10:33:41 2010 (r215396)
@@ -47,7 +47,7 @@ SRCS+= itbl-ops.c itbl-parse.y itbl-lex.
.if ${TARGET_ARCH} == "amd64"
SRCS+= tc-i386.c
-.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
+.elif ${TARGET_CPUARCH} == "powerpc"
SRCS+= tc-ppc.c
.elif ${TARGET_ARCH} == "sparc64"
SRCS+= tc-sparc.c
Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile Tue Nov 16 10:33:41 2010 (r215396)
@@ -55,8 +55,6 @@ SELARCH=
SELARCH= &bfd_i386_arch
.elif ${TARGET_ARCH} == "sparc64"
SELARCH= &bfd_sparc_arch
-.elif ${TARGET_ARCH} == "powerpc64"
-SELARCH= &bfd_powerpc_arch,&bfd_rs6000_arch
.else
.for _a in ${ARCHS}
.if ${SELARCH} == ""
Modified: projects/binutils-2.17/lib/clang/clang.build.mk
==============================================================================
--- projects/binutils-2.17/lib/clang/clang.build.mk Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/lib/clang/clang.build.mk Tue Nov 16 10:33:41 2010 (r215396)
@@ -18,14 +18,14 @@ TARGET_ARCH?= ${MACHINE_ARCH}
CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\"
.ifndef LLVM_REQUIRES_EH
-CFLAGS+=-fno-exceptions
+CXXFLAGS+=-fno-exceptions
.else
# If the library or program requires EH, it also requires RTTI.
LLVM_REQUIRES_RTTI=
.endif
.ifndef LLVM_REQUIRES_RTTI
-CFLAGS+=-fno-rtti
+CXXFLAGS+=-fno-rtti
.endif
.ifdef TOOLS_PREFIX
Modified: projects/binutils-2.17/sbin/hastd/primary.c
==============================================================================
--- projects/binutils-2.17/sbin/hastd/primary.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sbin/hastd/primary.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -511,7 +511,8 @@ init_remote(struct hast_resource *res, s
/* Prepare outgoing connection with remote node. */
if (proto_client(res->hr_remoteaddr, &out) < 0) {
- primary_exit(EX_TEMPFAIL, "Unable to create connection to %s",
+ primary_exit(EX_TEMPFAIL,
+ "Unable to create outgoing connection to %s",
res->hr_remoteaddr);
}
/* Try to connect, but accept failure. */
@@ -577,7 +578,8 @@ init_remote(struct hast_resource *res, s
* Setup incoming connection with remote node.
*/
if (proto_client(res->hr_remoteaddr, &in) < 0) {
- pjdlog_errno(LOG_WARNING, "Unable to create connection to %s",
+ primary_exit(EX_TEMPFAIL,
+ "Unable to create incoming connection to %s",
res->hr_remoteaddr);
}
/* Try to connect, but accept failure. */
@@ -2008,6 +2010,7 @@ guard_thread(void *arg)
PJDLOG_VERIFY(sigaddset(&mask, SIGINT) == 0);
PJDLOG_VERIFY(sigaddset(&mask, SIGTERM) == 0);
+ timeout.tv_sec = RETRY_SLEEP;
timeout.tv_nsec = 0;
signo = -1;
@@ -2033,7 +2036,6 @@ guard_thread(void *arg)
guard_one(res, ii);
lastcheck = now;
}
- timeout.tv_sec = RETRY_SLEEP;
signo = sigtimedwait(&mask, NULL, &timeout);
}
/* NOTREACHED */
Modified: projects/binutils-2.17/share/doc/papers/jail/mgt.ms
==============================================================================
--- projects/binutils-2.17/share/doc/papers/jail/mgt.ms Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/doc/papers/jail/mgt.ms Tue Nov 16 10:33:41 2010 (r215396)
@@ -56,8 +56,6 @@ FreeBSD build environment.
.PP
One notable difference from the default FreeBSD install is that only
a limited set of device nodes should be created.
-MAKEDEV(8) has been modified to accept a ``jail'' argument that creates
-the correct set of nodes.
.PP
To improve storage efficiency, a fair number of the binaries in the system tree
may be deleted, as they are not relevant in a jail environment.
Modified: projects/binutils-2.17/share/doc/smm/01.setup/2.t
==============================================================================
--- projects/binutils-2.17/share/doc/smm/01.setup/2.t Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/doc/smm/01.setup/2.t Tue Nov 16 10:33:41 2010 (r215396)
@@ -482,13 +482,7 @@ lw(2i) l.
\fB#\fP \fImount_mfs -s 1000 -T type /dev/null /tmp\fP (create a writable filesystem)
(\fItype\fP is the disk type as determined from /etc/disktab)
\fB#\fP \fIcd /tmp\fP (connect to that directory)
-\fB#\fP \fI../dev/MAKEDEV \*(Dk#\fP (create special files for root disk)
-(\fI\*(Dk\fP is the disk type, \fI#\fP is the unit number)
-(ignore warning from ``sh'')
\fB#\fP \fImount \-uw /tmp/\*(Dk#a /\fP (read-write mount root filesystem)
-\fB#\fP \fIcd /dev\fP (go to device directory)
-\fB#\fP \fI./MAKEDEV \*(Dk#\fP (create permanent special files for root disk)
-(again, ignore warning from ``sh'')
.TE
.DE
.Sh 4 "Step 4: (optional) restoring the root filesystem"
@@ -513,8 +507,6 @@ To really create the root filesystem on
you should first label the disk as described in step 5 below.
Then run the following commands:
.DS
-\fB#\fP \fIcd /dev\fP
-\fB#\fP \fI./MAKEDEV \*(Dk1a\fP
\fB#\fP\|\fInewfs /dev/r\*(Dk1a\fP
\fB#\fP\|\fImount /dev/\*(Dk1a /mnt\fP
\fB#\fP\|\fIcd /mnt\fP
@@ -1393,8 +1385,6 @@ To make the
.Pn /var
filesystem we would do:
.DS
-\fB#\fP \fIcd /dev\fP
-\fB#\fP \fIMAKEDEV \*(Dk1\fP
\fB#\fP \fIdisklabel -wr \*(Dk1 "disk type" "disk name"\fP
\fB#\fP \fInewfs \*(Dk1f\fP
(information about filesystem prints out)
Modified: projects/binutils-2.17/share/doc/smm/01.setup/4.t
==============================================================================
--- projects/binutils-2.17/share/doc/smm/01.setup/4.t Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/doc/smm/01.setup/4.t Tue Nov 16 10:33:41 2010 (r215396)
@@ -30,6 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)4.t 8.1 (Berkeley) 7/29/93
+.\" $FreeBSD$
.\"
.ds LH "Installing/Operating \*(4B
.ds CF \*(Dy
@@ -152,38 +153,11 @@ directory.
For all the devices supported by the distribution system, the
files in
.Pn /dev
-are created by the
-.Pn /dev/MAKEDEV
-shell script.
+are created by devfs.
.PP
Determine the set of devices that you have and create a new
.Pn /dev
-directory by running the MAKEDEV script.
-First create a new directory
-.Pn /newdev ,
-copy MAKEDEV into it, edit the file MAKEDEV.local
-to provide an entry for local needs,
-and run it to generate a
-.Pn /newdev directory.
-For instance,
-.DS
-\fB#\fP \fIcd /\fP
-\fB#\fP \fImkdir newdev\fP
-\fB#\fP \fIcp dev/MAKEDEV newdev/MAKEDEV\fP
-\fB#\fP \fIcd newdev\fP
-\fB#\fP \fIMAKEDEV \*(Dk0 pt0 std LOCAL\fP
-.DE
-Note the ``std'' argument causes standard devices such as
-.Pn /dev/console ,
-the machine console, to be created.
-.PP
-You can then do
-.DS
-\fB#\fP \fIcd /\fP
-\fB#\fP \fImv dev olddev ; mv newdev dev\fP
-\fB#\fP \fIsync\fP
-.DE
-to install the new device directory.
+directory by mounting devfs.
.Sh 3 "Building new system images"
.PP
The kernel configuration of each UNIX system is described by
@@ -232,8 +206,8 @@ the file
must be edited.
.PP
To add a new terminal device, be sure the device is configured into the system
-and that the special files for the device have been made by
-.Pn /dev/MAKEDEV .
+and that the special files for the device exist in
+.Pn /dev .
Then, enable the appropriate lines of
.Pn /etc/ttys
by setting the ``status''
@@ -335,9 +309,6 @@ Finally note that you should change the
terminals to ttyd?
where ? is in [0-9a-zA-Z], as some programs use this property of the
names to determine if a terminal is a dialup.
-Shell commands to do this should be put in the
-.Pn /dev/MAKEDEV.local
-script.
.PP
While it is possible to use truly arbitrary strings for terminal names,
the accounting and noticeably the
Modified: projects/binutils-2.17/share/doc/smm/01.setup/5.t
==============================================================================
--- projects/binutils-2.17/share/doc/smm/01.setup/5.t Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/doc/smm/01.setup/5.t Tue Nov 16 10:33:41 2010 (r215396)
@@ -30,6 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)5.t 8.1 (Berkeley) 7/27/93
+.\" $FreeBSD$
.\"
.ds lq ``
.ds rq ''
@@ -111,35 +112,6 @@ translations for machines that do not pa
command.
Additional information is provided in the manual page describing
.Xr ESIS (4).
-.PP
-To use the pseudo terminals just configured, device
-entries must be created in the
-.Pn /dev
-directory. To create 32
-pseudo terminals (plenty, unless you have a heavy network load)
-execute the following commands.
-.DS
-\fB#\fP \fIcd /dev\fP
-\fB#\fP \fIMAKEDEV pty0 pty1\fP
-.DE
-More pseudo terminals may be made by specifying
-.Pn pty2 ,
-.Pn pty3 ,
-etc. The kernel normally includes support for 32 pseudo terminals
-unless the configuration file specifies a different number.
-Each pseudo terminal really consists of two files in
-.Pn /dev :
-a master and a slave. The master pseudo terminal file is named
-.Pn /dev/ptyp? ,
-while the slave side is
-.Pn /dev/ttyp? .
-Pseudo terminals are also used by several programs not related to the network.
-In addition to creating the pseudo terminals,
-be sure to install them in the
-.Pn /etc/ttys
-file (with a `none' in the second column so no
-.Xr getty
-is started).
.Sh 2 "Local subnets"
.PP
In \*(4B the Internet support
Modified: projects/binutils-2.17/share/doc/smm/01.setup/spell.ok
==============================================================================
--- projects/binutils-2.17/share/doc/smm/01.setup/spell.ok Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/doc/smm/01.setup/spell.ok Tue Nov 16 10:33:41 2010 (r215396)
@@ -1,3 +1,4 @@
+# $FreeBSD$
A1096A
AA
ACU
@@ -91,7 +92,6 @@ LK201
LOGFILE
Leffler
Luna
-MAKEDEV.local
MB
MC68040
MFS
Modified: projects/binutils-2.17/share/man/man5/src.conf.5
==============================================================================
--- projects/binutils-2.17/share/man/man5/src.conf.5 Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/man/man5/src.conf.5 Tue Nov 16 10:33:41 2010 (r215396)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
.\" $FreeBSD$
-.Dd August 25, 2010
+.Dd November 14, 2010
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -355,6 +355,9 @@ Set to build some programs without optio
.It Va WITHOUT_GPIB
.\" from FreeBSD: head/tools/build/options/WITHOUT_GPIB 156932 2006-03-21 07:50:50Z ru
Set to not build GPIB bus support.
+.It Va WITH_GPIO
+.\" from FreeBSD: head/tools/build/options/WITH_GPIO 213463 2010-10-05 22:26:01Z gonzo
+Set to build gpioctl(8) as part of the base system.
.It Va WITHOUT_GROFF
.\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 156932 2006-03-21 07:50:50Z ru
Set to not build
Modified: projects/binutils-2.17/share/man/man8/Makefile
==============================================================================
--- projects/binutils-2.17/share/man/man8/Makefile Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/share/man/man8/Makefile Tue Nov 16 10:33:41 2010 (r215396)
@@ -4,7 +4,6 @@
MAN= crash.8 \
diskless.8 \
intro.8 \
- MAKEDEV.8 \
nanobsd.8 \
picobsd.8 \
rc.8 \
Modified: projects/binutils-2.17/sys/amd64/amd64/trap.c
==============================================================================
--- projects/binutils-2.17/sys/amd64/amd64/trap.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/amd64/amd64/trap.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -416,8 +416,7 @@ trap(struct trapframe *frame)
* without the ABI-tag ELF note.
*/
if (SV_CURPROC_ABI() == SV_ABI_FREEBSD
- && p->p_osrel >=
- __FreeBSD_version_SIGSEGV) {
+ && p->p_osrel >= P_OSREL_SIGSEGV) {
i = SIGSEGV;
ucode = SEGV_ACCERR;
} else {
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/avila_gpio.c
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/avila_gpio.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/avila_gpio.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -58,13 +58,8 @@ __FBSDID("$FreeBSD$");
#define GPIO_CLEAR_BITS(sc, reg, bits) \
GPIO_CONF_WRITE_4(sc, reg, GPIO_CONF_READ_4(sc, (reg)) & ~(bits))
-#define GPIO_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
-#define GPIO_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
-#define GPIO_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
-
struct avila_gpio_softc {
device_t sc_dev;
- struct mtx sc_mtx;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_gpio_ioh;
uint32_t sc_valid;
@@ -148,12 +143,12 @@ avila_gpio_pin_configure(struct avila_gp
uint32_t mask;
mask = 1 << pin->gp_pin;
- GPIO_LOCK(sc);
/*
* Manage input/output
*/
if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+ IXP4XX_GPIO_LOCK(sc);
pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
if (flags & GPIO_PIN_OUTPUT) {
pin->gp_flags |= GPIO_PIN_OUTPUT;
@@ -163,9 +158,8 @@ avila_gpio_pin_configure(struct avila_gp
pin->gp_flags |= GPIO_PIN_INPUT;
GPIO_SET_BITS(sc, IXP425_GPIO_GPOER, mask);
}
+ IXP4XX_GPIO_UNLOCK(sc);
}
-
- GPIO_UNLOCK(sc);
}
static int
@@ -184,10 +178,7 @@ avila_gpio_pin_getcaps(device_t dev, uin
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
- GPIO_LOCK(sc);
*caps = sc->sc_pins[pin].gp_caps;
- GPIO_UNLOCK(sc);
-
return (0);
}
@@ -199,11 +190,11 @@ avila_gpio_pin_getflags(device_t dev, ui
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
- GPIO_LOCK(sc);
+ IXP4XX_GPIO_LOCK(sc);
/* refresh since we do not own all the pins */
sc->sc_pins[pin].gp_flags = avila_gpio_pin_flags(sc, pin);
*flags = sc->sc_pins[pin].gp_flags;
- GPIO_UNLOCK(sc);
+ IXP4XX_GPIO_UNLOCK(sc);
return (0);
}
@@ -216,10 +207,7 @@ avila_gpio_pin_getname(device_t dev, uin
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
- GPIO_LOCK(sc);
memcpy(name, sc->sc_pins[pin].gp_name, GPIOMAXNAME);
- GPIO_UNLOCK(sc);
-
return (0);
}
@@ -254,12 +242,12 @@ avila_gpio_pin_set(device_t dev, uint32_
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask))
return (EINVAL);
- GPIO_LOCK(sc);
+ IXP4XX_GPIO_LOCK(sc);
if (value)
GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask);
else
GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask);
- GPIO_UNLOCK(sc);
+ IXP4XX_GPIO_UNLOCK(sc);
return (0);
}
@@ -272,9 +260,9 @@ avila_gpio_pin_get(device_t dev, uint32_
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
- GPIO_LOCK(sc);
+ IXP4XX_GPIO_LOCK(sc);
*val = (GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & (1 << pin)) ? 1 : 0;
- GPIO_UNLOCK(sc);
+ IXP4XX_GPIO_UNLOCK(sc);
return (0);
}
@@ -289,13 +277,13 @@ avila_gpio_pin_toggle(device_t dev, uint
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask))
return (EINVAL);
- GPIO_LOCK(sc);
- res = (GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & mask) ? 1 : 0;
+ IXP4XX_GPIO_LOCK(sc);
+ res = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & mask;
if (res)
GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask);
else
GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask);
- GPIO_UNLOCK(sc);
+ IXP4XX_GPIO_UNLOCK(sc);
return (0);
}
@@ -320,9 +308,6 @@ avila_gpio_attach(device_t dev)
sc->sc_iot = sa->sc_iot;
sc->sc_gpio_ioh = sa->sc_gpio_ioh;
- mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
- MTX_DEF);
-
for (i = 0; i < N(avila_gpio_pins); i++) {
struct avila_gpio_pin *p = &avila_gpio_pins[i];
@@ -342,14 +327,9 @@ avila_gpio_attach(device_t dev)
static int
avila_gpio_detach(device_t dev)
{
- struct avila_gpio_softc *sc = device_get_softc(dev);
-
- KASSERT(mtx_initialized(&sc->sc_mtx), ("gpio mutex not initialized"));
bus_generic_detach(dev);
- mtx_destroy(&sc->sc_mtx);
-
return(0);
}
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/avila_led.c
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/avila_led.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/avila_led.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -52,12 +52,14 @@ led_func(void *arg, int onoff)
struct led_avila_softc *sc = arg;
uint32_t reg;
+ IXP4XX_GPIO_LOCK();
reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOUTR);
if (onoff)
reg &= ~GPIO_LED_STATUS_BIT;
else
reg |= GPIO_LED_STATUS_BIT;
GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOUTR, reg);
+ IXP4XX_GPIO_UNLOCK();
}
static int
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/cambria_gpio.c
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/cambria_gpio.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/cambria_gpio.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -133,11 +133,11 @@ i2c_getsda(struct cambria_gpio_softc *sc
{
uint32_t reg;
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
return (reg & GPIO_I2C_SDA_BIT);
}
@@ -145,13 +145,13 @@ static void
i2c_setsda(struct cambria_gpio_softc *sc, int val)
{
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOUTR, GPIO_I2C_SDA_BIT);
if (val)
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
else
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
DELAY(I2C_DELAY);
}
@@ -159,13 +159,13 @@ static void
i2c_setscl(struct cambria_gpio_softc *sc, int val)
{
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOUTR, GPIO_I2C_SCL_BIT);
if (val)
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SCL_BIT);
else
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOER, GPIO_I2C_SCL_BIT);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
DELAY(I2C_DELAY);
}
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -66,6 +66,8 @@ uint32_t intr_steer2 = 0;
struct ixp425_softc *ixp425_softc = NULL;
+struct mtx ixp425_gpio_mtx;
+
static int ixp425_probe(device_t);
static void ixp425_identify(driver_t *, device_t);
static int ixp425_attach(device_t);
@@ -164,6 +166,7 @@ ixp425_set_gpio(struct ixp425_softc *sc,
{
uint32_t gpiotr = GPIO_CONF_READ_4(sc, GPIO_TYPE_REG(pin));
+ IXP4XX_GPIO_LOCK();
/* clear interrupt type */
GPIO_CONF_WRITE_4(sc, GPIO_TYPE_REG(pin),
gpiotr &~ GPIO_TYPE(pin, GPIO_TYPE_MASK));
@@ -176,6 +179,7 @@ ixp425_set_gpio(struct ixp425_softc *sc,
/* configure gpio line as an input */
GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER,
GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER) | (1<<pin));
+ IXP4XX_GPIO_UNLOCK();
}
static __inline void
@@ -313,6 +317,7 @@ ixp425_attach(device_t dev)
}
arm_post_filter = ixp425_post_filter;
+ mtx_init(&ixp425_gpio_mtx, "gpio", NULL, MTX_DEF);
if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE,
0, &sc->sc_gpio_ioh))
panic("%s: unable to map GPIO registers", __func__);
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425_iic.c
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425_iic.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425_iic.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -106,11 +106,11 @@ ixpiic_getscl(device_t dev)
struct ixpiic_softc *sc = ixpiic_sc;
uint32_t reg;
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SCL_BIT);
reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
return (reg & GPIO_I2C_SCL_BIT);
}
@@ -120,11 +120,11 @@ ixpiic_getsda(device_t dev)
struct ixpiic_softc *sc = ixpiic_sc;
uint32_t reg;
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
return (reg & GPIO_I2C_SDA_BIT);
}
@@ -133,13 +133,13 @@ ixpiic_setsda(device_t dev, int val)
{
struct ixpiic_softc *sc = ixpiic_sc;
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOUTR, GPIO_I2C_SDA_BIT);
if (val)
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
else
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOER, GPIO_I2C_SDA_BIT);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
DELAY(I2C_DELAY);
}
@@ -148,13 +148,13 @@ ixpiic_setscl(device_t dev, int val)
{
struct ixpiic_softc *sc = ixpiic_sc;
- mtx_lock(&Giant);
+ IXP4XX_GPIO_LOCK();
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOUTR, GPIO_I2C_SCL_BIT);
if (val)
GPIO_CONF_SET(sc, IXP425_GPIO_GPOER, GPIO_I2C_SCL_BIT);
else
GPIO_CONF_CLR(sc, IXP425_GPIO_GPOER, GPIO_I2C_SCL_BIT);
- mtx_unlock(&Giant);
+ IXP4XX_GPIO_UNLOCK();
DELAY(I2C_DELAY);
}
Modified: projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425var.h
==============================================================================
--- projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425var.h Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/arm/xscale/ixp425/ixp425var.h Tue Nov 16 10:33:41 2010 (r215396)
@@ -93,6 +93,9 @@ struct ixppcib_softc {
bus_space_write_4(sc->sc_iot, sc->sc_gpio_ioh, reg, data)
#define GPIO_CONF_READ_4(sc, reg) \
bus_space_read_4(sc->sc_iot, sc->sc_gpio_ioh, reg)
+#define IXP4XX_GPIO_LOCK() mtx_lock(&ixp425_gpio_mtx)
+#define IXP4XX_GPIO_UNLOCK() mtx_unlock(&ixp425_gpio_mtx)
+extern struct mtx ixp425_gpio_mtx;
extern struct bus_space ixp425_bs_tag;
extern struct bus_space ixp425_a4x_bs_tag;
Modified: projects/binutils-2.17/sys/boot/arm/uboot/ldscript.arm
==============================================================================
--- projects/binutils-2.17/sys/boot/arm/uboot/ldscript.arm Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/boot/arm/uboot/ldscript.arm Tue Nov 16 10:33:41 2010 (r215396)
@@ -1,6 +1,5 @@
/* $FreeBSD$ */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
OUTPUT_ARCH(arm)
ENTRY(_start)
SECTIONS
Modified: projects/binutils-2.17/sys/boot/forth/beastie.4th
==============================================================================
--- projects/binutils-2.17/sys/boot/forth/beastie.4th Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/boot/forth/beastie.4th Tue Nov 16 10:33:41 2010 (r215396)
@@ -140,12 +140,16 @@ at-xy ." `--{__________) [0m"
fbsdbw-logo
;
-: acpienabled? ( -- flag )
+: acpipresent? ( -- flag )
s" hint.acpi.0.rsdp" getenv
dup -1 = if
drop false exit
then
2drop
+ true
+;
+
+: acpienabled? ( -- flag )
s" hint.acpi.0.disabled" getenv
dup -1 <> if
s" 0" compare 0<> if
@@ -180,11 +184,18 @@ at-xy ." `--{__________) [0m"
printmenuitem ." Boot FreeBSD [default]" bootkey !
s" arch-i386" environment? if
drop
- printmenuitem ." Boot FreeBSD with ACPI " bootacpikey !
- acpienabled? if
- ." disabled"
+ acpipresent? if
+ printmenuitem ." Boot FreeBSD with ACPI " bootacpikey !
+ acpienabled? if
+ ." disabled"
+ else
+ ." enabled"
+ then
else
- ." enabled"
+ menuidx @
+ 1+ dup
+ menuidx !
+ -2 bootacpikey !
then
else
-2 bootacpikey !
Modified: projects/binutils-2.17/sys/compat/linsysfs/linsysfs.c
==============================================================================
--- projects/binutils-2.17/sys/compat/linsysfs/linsysfs.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/compat/linsysfs/linsysfs.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -182,8 +182,8 @@ linsysfs_run_bus(device_t dev, struct pf
sprintf(host, "host%d", host_number++);
strcat(new_path, "/");
strcat(new_path, host);
- sub_dir = pfs_create_dir(dir,
- host, NULL, NULL, NULL, 0);
+ pfs_create_dir(dir, host,
+ NULL, NULL, NULL, 0);
scsi_host = malloc(sizeof(
struct scsi_host_queue),
M_DEVBUF, M_NOWAIT);
Modified: projects/binutils-2.17/sys/compat/linux/linux_futex.c
==============================================================================
--- projects/binutils-2.17/sys/compat/linux/linux_futex.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/compat/linux/linux_futex.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -416,7 +416,7 @@ futex_atomic_op(struct thread *td, int e
int
linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args)
{
- int op_ret, val, ret, nrwake;
+ int clockrt, nrwake, op_ret, ret, val;
struct linux_emuldata *em;
struct waiting_proc *wp;
struct futex *f, *f2 = NULL;
@@ -429,7 +429,19 @@ linux_sys_futex(struct thread *td, struc
* in most cases (ie. when futexes are not shared on file descriptor
* or between different processes.).
*/
- args->op = (args->op & ~LINUX_FUTEX_PRIVATE_FLAG);
+ args->op = args->op & ~LINUX_FUTEX_PRIVATE_FLAG;
+
+ /*
+ * Currently support for switching between CLOCK_MONOTONIC and
+ * CLOCK_REALTIME is not present. However Linux forbids the use of
+ * FUTEX_CLOCK_REALTIME with any op except FUTEX_WAIT_BITSET and
+ * FUTEX_WAIT_REQUEUE_PI.
+ */
+ clockrt = args->op & LINUX_FUTEX_CLOCK_REALTIME;
+ args->op = args->op & ~LINUX_FUTEX_CLOCK_REALTIME;
+ if (clockrt && args->op != LINUX_FUTEX_WAIT_BITSET &&
+ args->op != LINUX_FUTEX_WAIT_REQUEUE_PI)
+ return (ENOSYS);
switch (args->op) {
case LINUX_FUTEX_WAIT:
@@ -612,14 +624,23 @@ linux_sys_futex(struct thread *td, struc
case LINUX_FUTEX_LOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_LOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_UNLOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_UNLOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_TRYLOCK_PI:
/* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op LINUX_FUTEX_TRYLOCK_PI not implemented.\n");
return (ENOSYS);
case LINUX_FUTEX_REQUEUE:
@@ -632,15 +653,30 @@ linux_sys_futex(struct thread *td, struc
*/
em = em_find(td->td_proc, EMUL_DONTLOCK);
if (em->used_requeue == 0) {
- printf("linux(%s (%d)) sys_futex: "
- "unsupported futex_requeue op\n",
- td->td_proc->p_comm, td->td_proc->p_pid);
- em->used_requeue = 1;
+ linux_msg(td,
+ "linux_sys_futex: "
+ "unsupported futex_requeue op\n");
+ em->used_requeue = 1;
}
return (EINVAL);
+ case LINUX_FUTEX_WAIT_BITSET:
+ /* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op FUTEX_WAIT_BITSET not implemented.\n");
+ return (ENOSYS);
+
+ case LINUX_FUTEX_WAIT_REQUEUE_PI:
+ /* not yet implemented */
+ linux_msg(td,
+ "linux_sys_futex: "
+ "op FUTEX_WAIT_REQUEUE_PI not implemented.\n");
+ return (ENOSYS);
+
default:
- printf("linux_sys_futex: unknown op %d\n", args->op);
+ linux_msg(td,
+ "linux_sys_futex: unknown op %d\n", args->op);
return (ENOSYS);
}
@@ -665,7 +701,7 @@ linux_set_robust_list(struct thread *td,
em->robust_futexes = args->head;
EMUL_UNLOCK(&emul_lock);
- return (0);
+ return (0);
}
int
@@ -683,7 +719,7 @@ linux_get_robust_list(struct thread *td,
if (!args->pid) {
em = em_find(td->td_proc, EMUL_DONTLOCK);
- head = em->robust_futexes;
+ head = em->robust_futexes;
} else {
struct proc *p;
@@ -693,14 +729,14 @@ linux_get_robust_list(struct thread *td,
em = em_find(p, EMUL_DONTLOCK);
/* XXX: ptrace? */
- if (priv_check(td, PRIV_CRED_SETUID) ||
+ if (priv_check(td, PRIV_CRED_SETUID) ||
priv_check(td, PRIV_CRED_SETEUID) ||
p_candebug(td, p)) {
PROC_UNLOCK(p);
return (EPERM);
}
head = em->robust_futexes;
-
+
PROC_UNLOCK(p);
}
Modified: projects/binutils-2.17/sys/compat/linux/linux_futex.h
==============================================================================
--- projects/binutils-2.17/sys/compat/linux/linux_futex.h Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/compat/linux/linux_futex.h Tue Nov 16 10:33:41 2010 (r215396)
@@ -39,17 +39,20 @@
extern LIST_HEAD(futex_list, futex) futex_list;
extern struct mtx futex_mtx;
-#define LINUX_FUTEX_WAIT 0
-#define LINUX_FUTEX_WAKE 1
-#define LINUX_FUTEX_FD 2 /* unused */
-#define LINUX_FUTEX_REQUEUE 3
-#define LINUX_FUTEX_CMP_REQUEUE 4
-#define LINUX_FUTEX_WAKE_OP 5
-#define LINUX_FUTEX_LOCK_PI 6
-#define LINUX_FUTEX_UNLOCK_PI 7
-#define LINUX_FUTEX_TRYLOCK_PI 8
+#define LINUX_FUTEX_WAIT 0
+#define LINUX_FUTEX_WAKE 1
+#define LINUX_FUTEX_FD 2 /* unused */
+#define LINUX_FUTEX_REQUEUE 3
+#define LINUX_FUTEX_CMP_REQUEUE 4
+#define LINUX_FUTEX_WAKE_OP 5
+#define LINUX_FUTEX_LOCK_PI 6
+#define LINUX_FUTEX_UNLOCK_PI 7
+#define LINUX_FUTEX_TRYLOCK_PI 8
+#define LINUX_FUTEX_WAIT_BITSET 9
+#define LINUX_FUTEX_WAIT_REQUEUE_PI 11
#define LINUX_FUTEX_PRIVATE_FLAG 128
+#define LINUX_FUTEX_CLOCK_REALTIME 256
#define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */
#define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */
Modified: projects/binutils-2.17/sys/dev/drm/drmP.h
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/drmP.h Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/drmP.h Tue Nov 16 10:33:41 2010 (r215396)
@@ -80,7 +80,9 @@ struct drm_file;
#include <machine/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
+#if defined(__i386__) || defined(__amd64__)
#include <machine/specialreg.h>
+#endif
#include <machine/sysarch.h>
#include <sys/endian.h>
#include <sys/mman.h>
@@ -246,20 +248,20 @@ typedef u_int8_t u8;
*(volatile u_int8_t *)(((vm_offset_t)(map)->virtual) + \
(vm_offset_t)(offset))
#define DRM_READ16(map, offset) \
- *(volatile u_int16_t *)(((vm_offset_t)(map)->virtual) + \
- (vm_offset_t)(offset))
+ le16toh(*(volatile u_int16_t *)(((vm_offset_t)(map)->virtual) + \
+ (vm_offset_t)(offset)))
#define DRM_READ32(map, offset) \
- *(volatile u_int32_t *)(((vm_offset_t)(map)->virtual) + \
- (vm_offset_t)(offset))
+ le32toh(*(volatile u_int32_t *)(((vm_offset_t)(map)->virtual) + \
+ (vm_offset_t)(offset)))
#define DRM_WRITE8(map, offset, val) \
*(volatile u_int8_t *)(((vm_offset_t)(map)->virtual) + \
(vm_offset_t)(offset)) = val
#define DRM_WRITE16(map, offset, val) \
*(volatile u_int16_t *)(((vm_offset_t)(map)->virtual) + \
- (vm_offset_t)(offset)) = val
+ (vm_offset_t)(offset)) = htole16(val)
#define DRM_WRITE32(map, offset, val) \
*(volatile u_int32_t *)(((vm_offset_t)(map)->virtual) + \
- (vm_offset_t)(offset)) = val
+ (vm_offset_t)(offset)) = htole32(val)
#define DRM_VERIFYAREA_READ( uaddr, size ) \
(!useracc(__DECONST(caddr_t, uaddr), size, VM_PROT_READ))
Modified: projects/binutils-2.17/sys/dev/drm/drm_agpsupport.c
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/drm_agpsupport.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/drm_agpsupport.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -318,7 +318,7 @@ int drm_agp_bind(struct drm_device *dev,
if (!dev->agp || !dev->agp->acquired)
return EINVAL;
- DRM_DEBUG("agp_bind, page_size=%x\n", PAGE_SIZE);
+ DRM_DEBUG("agp_bind, page_size=%x\n", (int)PAGE_SIZE);
entry = drm_agp_lookup_entry(dev, (void *)request->handle);
if (entry == NULL || entry->bound)
Modified: projects/binutils-2.17/sys/dev/drm/drm_drv.c
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/drm_drv.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/drm_drv.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -478,7 +478,7 @@ static int drm_load(struct drm_device *d
retcode = ENOMEM;
goto error;
}
- if (dev->agp != NULL) {
+ if (dev->agp != NULL && dev->agp->info.ai_aperture_base != 0) {
if (drm_mtrr_add(dev->agp->info.ai_aperture_base,
dev->agp->info.ai_aperture_size, DRM_MTRR_WC) == 0)
dev->agp->mtrr = 1;
Modified: projects/binutils-2.17/sys/dev/drm/drm_memory.c
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/drm_memory.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/drm_memory.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -73,7 +73,7 @@ void drm_mem_uninit(void)
void *drm_ioremap_wc(struct drm_device *dev, drm_local_map_t *map)
{
- return pmap_mapdev_attr(map->offset, map->size, PAT_WRITE_COMBINING);
+ return pmap_mapdev_attr(map->offset, map->size, VM_MEMATTR_WRITE_COMBINING);
}
void *drm_ioremap(struct drm_device *dev, drm_local_map_t *map)
Modified: projects/binutils-2.17/sys/dev/drm/drm_sysctl.c
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/drm_sysctl.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/drm_sysctl.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -259,7 +259,7 @@ static int drm_bufs_info DRM_SYSCTL_HAND
*(1 << dma->bufs[i].page_order),
(dma->bufs[i].seg_count
* (1 << dma->bufs[i].page_order))
- * PAGE_SIZE / 1024);
+ * (int)PAGE_SIZE / 1024);
}
DRM_SYSCTL_PRINT("\n");
for (i = 0; i < dma->buf_count; i++) {
Modified: projects/binutils-2.17/sys/dev/drm/radeon_cs.c
==============================================================================
--- projects/binutils-2.17/sys/dev/drm/radeon_cs.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/drm/radeon_cs.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -765,7 +765,7 @@ static int r600_cs_parse(struct drm_rade
memcpy(parser->ib, ib_chunk->kdata, ib_chunk->length_dw * sizeof(uint32_t));
/* read back last byte to flush WC buffers */
- rb = readl(((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
+ rb = *(volatile u_int32_t *) (((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
return 0;
}
Modified: projects/binutils-2.17/sys/dev/firewire/00README
==============================================================================
--- projects/binutils-2.17/sys/dev/firewire/00README Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/firewire/00README Tue Nov 16 10:33:41 2010 (r215396)
@@ -44,10 +44,6 @@ IEEE 1394 support for FreeBSD-5.X and 4.
- make install
- make load
- For FreeBSD-4 user:
-
- - ./MAKEDEV
-
3. SBP-II support (sbp)
- You need CAM(SCSI) support in your kernel.
Modified: projects/binutils-2.17/sys/dev/mii/brgphy.c
==============================================================================
--- projects/binutils-2.17/sys/dev/mii/brgphy.c Tue Nov 16 09:34:31 2010 (r215395)
+++ projects/binutils-2.17/sys/dev/mii/brgphy.c Tue Nov 16 10:33:41 2010 (r215396)
@@ -154,15 +154,19 @@ static int
detect_hs21(struct bce_softc *bce_sc)
{
char *sysenv;
+ int found;
- if (bce_sc->bce_chipid != HS21_BCM_CHIPID)
- return (0);
- sysenv = getenv("smbios.system.product");
- if (sysenv == NULL)
- return (0);
- if (strncmp(sysenv, HS21_PRODUCT_ID, strlen(HS21_PRODUCT_ID)) != 0)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list