Date: Sat, 19 Jun 2004 21:43:41 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55333 for review Message-ID: <200406192143.i5JLhf7w017800@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55333 Change 55333 by marcel@marcel_nfs on 2004/06/19 21:43:19 IFC @55331 Affected files ... .. //depot/projects/gdb/contrib/gcc/config/i386/i386.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#7 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.alpha#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.ia64#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#3 integrate .. //depot/projects/gdb/share/man/man4/watchdog.4#4 integrate Differences ... ==== //depot/projects/gdb/contrib/gcc/config/i386/i386.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.19 2004/06/19 07:29:04 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.20 2004/06/19 20:40:00 obrien Exp $ */ #include "config.h" @@ -14607,14 +14607,23 @@ output_asm_insn ("mov{l}\t{%0, %1|%1, %0}", xops); } +#ifdef __amd64__ xops[0] = XEXP (DECL_RTL (function), 0); +#else + xops[0] = DECL_RTL (function); +#endif if (TARGET_64BIT) { if (!flag_pic || (*targetm.binds_local_p) (function)) output_asm_insn ("jmp\t%P0", xops); else { +#ifdef __amd64__ tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, xops[0]), UNSPEC_GOTPCREL); +#else + tmp = XEXP (xops[0], 0); + tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, tmp), UNSPEC_GOTPCREL); +#endif tmp = gen_rtx_CONST (Pmode, tmp); tmp = gen_rtx_MEM (QImode, tmp); xops[0] = tmp; ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#7 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.29 2004/06/19 19:44:19 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.31 2004/06/19 20:50:57 marcel Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes LIB= bfd -SRCS+= archive.c archive64.c archures.c bfd.c binary.c cache.c \ +SRCS+= archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \ coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \ hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ @@ -63,4 +63,10 @@ sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} .endif +elf32-target.h: elfxx-target.h + sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} + +elf64-target.h: elfxx-target.h + sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} + .include <bsd.lib.mk> ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.alpha#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.11 2004/06/16 07:09:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.12 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_alpha_freebsd_vec @@ -10,5 +10,3 @@ .endif CLEANFILES+= elf64-target.h -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.2 2003/07/01 17:29:48 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.3 2004/06/19 20:37:38 marcel Exp $ .include "${.CURDIR}/Makefile.i386" @@ -13,9 +13,6 @@ CLEANFILES+= elf64-target.h -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} - CLEANFILES+= elf64-amd64-fbsd.c elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.15 2004/06/16 07:09:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.16 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec @@ -14,5 +14,3 @@ .endif CLEANFILES+= elf32-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.ia64#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.6 2002/12/05 18:27:22 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.8 2004/06/19 21:14:10 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_ia64_little_vec SRCS+= cofflink.c cpu-ia64.c efi-app-ia64.c elf32.c elf32-gen.c elf64.c \ elf64-gen.c elf64-ia64.c elflink.c -#SRCS+= coff-ia64.c elf32-ia64.c VECS+= ${DEFAULT_VECTOR} \ bfd_efi_app_ia64_vec \ @@ -20,14 +19,8 @@ SRCS+= ${GENSRCS} CLEANFILES+= ${GENSRCS} -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} - -elf64-ia64.c: elfxx-ia64.c - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} +elf64-ia64.c: elfxx-ia64.c elf-fbsd-brand.c + cat ${.ALLSRC} | sed -e s/NN/64/g > ${.TARGET} pepigen.c: peXXigen.c sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.6 2002/12/02 09:59:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.7 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_powerpc_vec @@ -21,5 +21,3 @@ .endif CLEANFILES+= elf32-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.8 2004/06/17 16:08:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.9 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_sparc_vec @@ -20,11 +20,6 @@ .endif CLEANFILES+= elf32-target.h elf64-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} CLEANFILES+= elf64-sparc%FIXED.c elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff ==== //depot/projects/gdb/share/man/man4/watchdog.4#4 (text+ko) ==== @@ -23,53 +23,64 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.5 2004/04/29 08:33:12 smkelly Exp $ +.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.6 2004/06/19 21:17:07 smkelly Exp $ .\" .Dd June 25, 2003 -.Dt watchdog 4 +.Dt WATCHDOG 4 .Os .Sh NAME .Nm watchdog -.Nd Hardware and Software watchdog +.Nd "hardware and software watchdog" .Sh SYNOPSIS -.Cd options CPU_ELAN -.Cd options CPU_GEODE -.Cd options SW_WATCHDOG +.Cd "options CPU_ELAN" +.Cd "options CPU_GEODE" +.Cd "options SW_WATCHDOG" .Pp .In sys/watchdog.h -.Bd -literal - -u_int u = WD_ACTIVE | WD_8SEC; -int fd = open("/dev/" _PATH_WATCHDOG, O_RDWR); - -ioctl(fd, WDIOCPATPAT, &u); -.Ed .Sh DESCRIPTION +The .Nm -is a facility for controlling hardware and software watchdog facilities. +facility is used for controlling hardware and software watchdogs. .Pp -The interface is through a device named "/dev/" +The interface is through a device named +.Qq Li /dev/ .Dv _PATH_WATCHDOG -which -responds to a single ioctl call, +which responds to a single +.Xr ioctl 2 +call, .Dv WDIOCPATPAT . .Pp -The ioctl call takes an argument which consists of a timeout value +The call takes a single argument which represents a timeout value specified as an integer power of two nanoseconds. .Pp The .Dv WD_ACTIVE -flag signals that the watchdog will be kept from +flag signals that the +.Nm +will be kept from timing out from userland, for instance by the .Xr watchdogd 8 daemon. .Pp -To disable the watchdogs, use an argument of zero. +To disable the watchdogs, an argument of zero should be used. .Pp -The ioctl call will return success if just one of the available -watchdog implementations support the request. -If the ioctl fails, for instance if no watchdog supports the timeout -length, all watchdogs are disabled and must be explicitly reenabled. +The +.Xr ioctl 2 +call will return success if just one of the available +.Xr watchdog 9 +implementations support the request. +If the call fails, for instance if none of +.Xr watchdog 9 +implementations support the timeout +length, all watchdogs are disabled and must be explicitly re-enabled. +.Sh EXAMPLES +.\" XXX insert some descriptive text here +.Bd -literal -offset indent +u_int u = WD_ACTIVE | WD_TO_8SEC; +int fd = open("/dev/" _PATH_WATCHDOG, O_RDWR); + +ioctl(fd, WDIOCPATPAT, &u); +.Ed .Sh SEE ALSO .Xr watchdogd 8 , .Xr watchdog 9 @@ -81,13 +92,11 @@ .Sh AUTHORS .An -nosplit The -.Nm watchdog -facility were written by +.Nm +facility was written by .An Poul-Henning Kamp Aq phk@FreeBSD.org . -.Pp -The -.Nm SW_WATCHDOG -code and manual page were written by +The software watchdog code +and this manual page were written by .An Sean Kelly Aq smkelly@FreeBSD.org . Some contributions were made by .An Jeff Roberson Aq jeff@FreeBSD.org .
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406192143.i5JLhf7w017800>