PERFORCE change 30894 for review
Robert Watson
rwatson at FreeBSD.org
Sat May 10 00:07:10 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=30894
Change 30894 by rwatson at rwatson_tislabs on 2003/05/09 17:06:54
Integrate the TrustedBSD base branch from the FreeBSD vendor
branch; loop back MAC Framework policy/slot rename.
Various other FreeBSD bugfixes from 5.1-BETA.
Affected files ...
.. //depot/projects/trustedbsd/base/bin/echo/echo.1#3 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#13 integrate
.. //depot/projects/trustedbsd/base/etc/devd.conf#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/_fpmath.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/alloca.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/modf.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/powerpc/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/arith.h#2 integrate
.. //depot/projects/trustedbsd/base/libexec/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#14 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#42 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 integrate
.. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#12 integrate
.. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#16 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#8 integrate
.. //depot/projects/trustedbsd/base/sbin/ldconfig/ldconfig.8#4 integrate
.. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/disktab.5#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/procfs.5#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/Makefile#27 integrate
.. //depot/projects/trustedbsd/base/sys/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/npx.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/sys/_label.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#23 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#33 integrate
.. //depot/projects/trustedbsd/base/usr.bin/Makefile#26 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/xlint/lint1/param.h#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#23 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pw/pw.8#7 integrate
Differences ...
==== //depot/projects/trustedbsd/base/bin/echo/echo.1#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)echo.1 8.1 (Berkeley) 7/22/93
-.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $
+.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $
.\"
.Dd April 12, 2003
.Dt ECHO 1
@@ -58,11 +58,20 @@
The following option is available:
.Bl -tag -width flag
.It Fl n
-Do not print the trailing newline character. This may also be
-achieved by appending
+Do not print the trailing newline character.
+This may also be achieved by appending
.Ql \ec
to the end of the string, as is done
by iBCS2 compatible systems.
+Note that this option as well as the effect of
+.Ql \ec
+are implementation-defined in
+.St -p1003.1-2001
+as amended by Cor. 1-2002.
+Applications aiming for maximum
+portability are strongly encouraged to use
+.Xr printf 1
+to suppress the newline character.
.El
.Pp
Some shells may provide a builtin
==== //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#13 (text+ko) ====
@@ -22,7 +22,7 @@
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */
#undef CC1_SPEC
#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -135,7 +135,7 @@
#define FUNCTION_PROFILER(FILE, LABELNO) \
do { \
if (flag_pic) \
- fprintf ((FILE), "\tcall *.mcount%s at GOT(%%ebx)\n"); \
+ fprintf ((FILE), "\tcall *.mcount at GOT(%%ebx)\n"); \
else \
fprintf ((FILE), "\tcall .mcount\n"); \
} while (0)
==== //depot/projects/trustedbsd/base/etc/devd.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -66,9 +66,9 @@
# Don't even try to second guess what to do about drivers that don't
# match here. Instead, pass it off to syslog. Commented out for the
# moment, as pnpinfo isn't set in devd yet
-nomatch 0 {
- // action "logger Unknown device: $pnpinfo $location $bus";
-};
+#nomatch 0 {
+# action "logger Unknown device: $pnpinfo $location $bus";
+#};
/* EXAMPLES TO END OF FILE
==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $
.include "../Makefile.inc0"
@@ -9,7 +9,12 @@
ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
wrstabs.c version.c binemul.c budemang.c emul_vanilla.c
WARNS= 0
-CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
+.if ${TARGET_ARCH} == "amd64"
+BINUTILS_ARCH=x86_64
+.else
+BINUTILS_ARCH=${TARGET_ARCH}
+.endif
+CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\"
CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd
==== //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/netlib/gdtoa
*
- * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.1 2003/03/12 20:29:58 das Exp $
+ * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
==== //depot/projects/trustedbsd/base/lib/libc/amd64/_fpmath.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/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $
+ * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $
*/
union IEEEl2bits {
@@ -33,7 +33,8 @@
unsigned int manh :32;
unsigned int exp :15;
unsigned int sign :1;
- unsigned int junk :16;
+ unsigned int junkl :16;
+ unsigned int junkh :32;
} bits;
};
==== //depot/projects/trustedbsd/base/lib/libc/amd64/arith.h#2 (text+ko) ====
@@ -1,8 +1,19 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
#define Arith_Kind_ASL 1
+#define Long int
+#define Intcast (int)(long)
+#define Double_Align
+#define X64_bit_pointers
==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $
+# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $
-SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \
+SRCS+= _setjmp.S setjmp.S sigsetjmp.S \
fabs.S modf.S \
frexp.c infinity.c isinf.c
==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/alloca.S#2 (text+ko) ====
@@ -38,14 +38,14 @@
.asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $");
/* like alloc, but automatic automatic free in return */
ENTRY(alloca)
popq %rdx /* pop return addr */
- movl %rsp,%rcx
+ movq %rsp,%rcx
addq $15,%rdi /* round amount to allocate up to 16 bytes */
andq $~15,%rdi
subq %rdi,%rsp
==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/modf.S#2 (text+ko) ====
@@ -40,7 +40,7 @@
#if defined(LIBC_SCCS)
RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $")
#endif
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $");
/*
* modf(value, iptr): return fractional part of value, and stores the
@@ -52,44 +52,41 @@
/* With CHOP mode on, frndint behaves as TRUNC does. Useful. */
ENTRY(modf)
- pushq %rbp
- movq %rsp,%rbp
- subq $24,%rsp
/*
* Set chop mode.
*/
- fnstcw -12(%rbp)
- movw -12(%rbp),%dx
+ fnstcw -12(%rsp)
+ movw -12(%rsp),%dx
orw $3072,%dx
- movw %dx,-16(%rbp)
- fldcw -16(%rbp)
+ movw %dx,-16(%rsp)
+ fldcw -16(%rsp)
/*
* Get integral part.
*/
- movsd %xmm0,-24(%rbp)
- fldl -24(%rbp)
+ movsd %xmm0,-24(%rsp)
+ fldl -24(%rsp)
frndint
- fstpl -8(%rbp)
+ fstpl -8(%rsp)
/*
* Restore control word.
*/
- fldcw -12(%rbp)
+ fldcw -12(%rsp)
/*
* Store integral part.
*/
- movsd -8(%rbp),%xmm0
+ movsd -8(%rsp),%xmm0
movsd %xmm0,(%rdi)
/*
* Get fractional part and return it.
*/
- fldl -24(%rbp)
- fsubl -8(%rbp)
- movsd -8(%rbp),%xmm0
+ fldl -24(%rsp)
+ fsubl -8(%rsp)
+ fstpl -8(%rsp)
+ movsd -8(%rsp),%xmm0
- leave
ret
==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ====
@@ -38,7 +38,7 @@
.asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $");
/*
* C library -- _setjmp, _longjmp
@@ -55,9 +55,9 @@
ENTRY(setjmp)
pushq %rdi
movq %rdi,%rcx
- leaq 72(%rcx),%rdi /* (sigset_t*)oset */
+ movq $1,%rdi /* SIG_BLOCK */
movq $0,%rsi /* (sigset_t*)set */
- movq $1,%rdx /* SIG_BLOCK */
+ leaq 72(%rcx),%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rdi
movq %rdi,%rcx
@@ -80,9 +80,9 @@
pushq %rdi
pushq %rsi
movq %rdi,%rdx
- movq $0,%rdi /* (sigset_t*)oset */
+ movq $3,%rdi /* SIG_SETMASK */
leaq 72(%rdx),%rsi /* (sigset_t*)set */
- movq $3,%rdx /* SIG_SETMASK */
+ movq $0,%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rsi
popq %rdi /* jmpbuf */
==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ====
@@ -41,7 +41,7 @@
.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
#endif /* LIBC_SCCS and not lint */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $");
#include "SYS.h"
@@ -58,18 +58,17 @@
*/
ENTRY(sigsetjmp)
- pushq %rdi
- movq %rdi,%rcx
- movl %esi,88(%rcx)
+ movl %esi,88(%rdi)
testl %esi,%esi
jz 2f
- leaq 72(%rcx),%rdi /* (sigset_t*)oset */
+ pushq %rdi
+ movq $1,%rdi /* SIG_BLOCK */
movq $0,%rsi /* (sigset_t*)set */
- movq $1,%rdx /* SIG_BLOCK */
+ leaq 72(%rcx),%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rdi
- movq %rdi,%rcx
-2: movq 0(%rsp),%rdx /* retval */
+2: movq %rdi,%rcx
+ movq 0(%rsp),%rdx /* retval */
movq %rdx, 0(%rcx) /* retval */
movq %rbx, 8(%rcx)
movq %rsp,16(%rcx)
@@ -90,9 +89,9 @@
movq %rdi,%rdx
pushq %rdi
pushq %rsi
- movq $0,%rdi /* (sigset_t*)oset */
+ movq $3,%rdi /* SIG_SETMASK */
leaq 72(%rdx),%rsi /* (sigset_t*)set */
- movq $3,%rdx /* SIG_SETMASK */
+ movq $0,%rdx /* (sigset_t*)oset */
call PIC_PLT(CNAME(_sigprocmask))
popq %rsi
popq %rdi /* jmpbuf */
==== //depot/projects/trustedbsd/base/lib/libc/i386/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_8087
==== //depot/projects/trustedbsd/base/lib/libc/ia64/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#include <machine/endian.h>
==== //depot/projects/trustedbsd/base/lib/libc/powerpc/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_MC68k
==== //depot/projects/trustedbsd/base/lib/libc/sparc64/arith.h#2 (text+ko) ====
@@ -1,7 +1,14 @@
/*
* MD header for contrib/gdtoa
*
- * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $
+ * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $
+ */
+
+/*
+ * NOTE: The definitions in this file must be correct or strtod(3) and
+ * floating point formats in printf(3) will break! The file can be
+ * generated by running contrib/gdtoa/arithchk.c on the target
+ * architecture. See contrib/gdtoa/gdtoaimp.h for details.
*/
#define IEEE_MC68k
==== //depot/projects/trustedbsd/base/libexec/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/Makefile,v 1.58 2003/05/05 07:58:42 markm Exp $
+# $FreeBSD: src/libexec/Makefile,v 1.59 2003/05/08 06:37:12 peter Exp $
# Present but disabled: kpasswdd
SUBDIR= atrun \
@@ -23,13 +23,16 @@
rpc.rwalld \
rpc.sprayd \
rshd \
- rtld-elf \
save-entropy \
talkd \
tcpd \
tftpd \
ypxfr
+.if ${MACHINE_ARCH} != amd64
+SUBDIR+=rtld-elf
+.endif
+
.if !defined(NO_BIND)
SUBDIR+=named-xfer
.endif
==== //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#14 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.78 2003/05/04 00:56:00 obrien Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.79 2003/05/08 01:31:36 kan Exp $
*/
/*
@@ -126,6 +126,7 @@
static void unlink_object(Obj_Entry *);
static void unload_object(Obj_Entry *);
static void unref_dag(Obj_Entry *);
+static void ref_dag(Obj_Entry *);
void r_debug_state(struct r_debug*, struct link_map*);
@@ -361,7 +362,6 @@
*obj_tail = obj_main;
obj_tail = &obj_main->next;
obj_count++;
- obj_main->refcount++;
/* Make sure we don't call the main program's init and fini functions. */
obj_main->init = obj_main->fini = NULL;
@@ -383,8 +383,10 @@
die();
/* Make a list of all objects loaded at startup. */
- for (obj = obj_list; obj != NULL; obj = obj->next)
+ for (obj = obj_list; obj != NULL; obj = obj->next) {
objlist_push_tail(&list_main, obj);
+ obj->refcount++;
+ }
if (ld_tracing) { /* We're done */
trace_loaded_objects(obj_main);
@@ -970,6 +972,8 @@
if (donelist_check(dlp, obj))
return;
+
+ obj->refcount++;
objlist_push_tail(&obj->dldags, root);
objlist_push_tail(&root->dagmembers, obj);
for (needed = obj->needed; needed != NULL; needed = needed->next)
@@ -1223,7 +1227,6 @@
} else
free(path);
- obj->refcount++;
return obj;
}
@@ -1579,6 +1582,7 @@
/* Unreference the object and its dependencies. */
root->dl_refcount--;
+
unref_dag(root);
if (root->refcount == 0) {
@@ -1682,8 +1686,14 @@
/* Make list of init functions to call. */
initlist_add_objects(obj, &obj->next, &initlist);
}
- } else if (ld_tracing)
- goto trace;
+ } else {
+
+ /* Bump the reference counts for objects on this DAG. */
+ ref_dag(obj);
+
+ if (ld_tracing)
+ goto trace;
+ }
}
GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL);
@@ -2405,7 +2415,6 @@
static void
unlink_object(Obj_Entry *root)
{
- const Needed_Entry *needed;
Objlist_Entry *elm;
if (root->refcount == 0) {
@@ -2413,25 +2422,28 @@
objlist_remove(&list_global, root);
/* Remove the object from all objects' DAG lists. */
- STAILQ_FOREACH(elm, &root->dagmembers , link)
+ STAILQ_FOREACH(elm, &root->dagmembers , link) {
objlist_remove(&elm->obj->dldags, root);
+ if (elm->obj != root)
+ unlink_object(elm->obj);
+ }
}
+}
- for (needed = root->needed; needed != NULL; needed = needed->next)
- if (needed->obj != NULL)
- unlink_object(needed->obj);
+static void
+ref_dag(Obj_Entry *root)
+{
+ Objlist_Entry *elm;
+
+ STAILQ_FOREACH(elm, &root->dagmembers , link)
+ elm->obj->refcount++;
}
static void
unref_dag(Obj_Entry *root)
{
- const Needed_Entry *needed;
+ Objlist_Entry *elm;
- if (root->refcount == 0)
- return;
- root->refcount--;
- if (root->refcount == 0)
- for (needed = root->needed; needed != NULL; needed = needed->next)
- if (needed->obj != NULL)
- unref_dag(needed->obj);
+ STAILQ_FOREACH(elm, &root->dagmembers , link)
+ elm->obj->refcount--;
}
==== //depot/projects/trustedbsd/base/release/Makefile#42 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.774 2003/05/05 07:58:42 markm Exp $
+# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -756,6 +756,117 @@
.endif
touch release.9
+release.9.alpha:
+.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH}
+ cp ${RD}/trees/base/etc/disktab /etc
+ rm -rf ${RD}/mfsfd
+ mkdir ${RD}/mfsfd
+ cd ${RD}/mfsfd && \
+ mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
+ @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
+ DIR=${RD}/mfsfd/stand ZIP=false
+ ( cd ${RD}/mfsfd && \
+ for dir in bin sbin ; do \
+ ln -sf /stand $$dir; \
+ done )
+ cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand
+.if ${TARGET} == "pc98"
+ cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
+.endif
+ cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
+ ( for F in defaults/rc.conf netconfig protocols ; do \
+ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
+ ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \
+ done )
+ grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \
+ ${RD}/trees/base/etc/services | \
+ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
+ > ${RD}/mfsfd/stand/etc/services
+ ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
+ ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
+ cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
+.if !defined(NODOC)
+ @for i in ${DIST_DOCS_ARCH_INDEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ done
+ @for i in ${DIST_DOCS_ARCH_DEP}; do \
+ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+ done
+ @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT
+ @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT
+.endif
+ -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
+ @mkdir -p ${RD}/mfsfd/boot
+.if ${TARGET_ARCH} != "ia64"
+ @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
+.endif
+.if ${TARGET} == "i386"
+ @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
+.endif
+ @echo "Making the regular boot floppy."
+ @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
+ tar xf - -C ${RD}/mfsfd/stand
+.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES)
+ rm -rf ${RD}/mfsfd/stand/help/*
+.endif
+.if defined(SMALLBOOTSIZE)
+.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
+ @rm -rf ${RD}/mfsfd/modules
+ @mkdir -p ${RD}/mfsfd/modules
+ @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
+ ${.CURDIR}/${TARGET}/drivers-small.conf \
+ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
+.endif
+ sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
+ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
+ @gzip -9vc mfsroot > mfsroot.gz
+ @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \
+ ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
+ ${BOOTINODE} ${SMALLBOOTLABEL}
+.endif
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+ @rm -rf ${RD}/mfsfd/modules
+ @mkdir -p ${RD}/mfsfd/modules
+ @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
+ ${.CURDIR}/${TARGET}/drivers.conf \
+ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
+ @rm -rf ${RD}/driversfd
+ @mkdir ${RD}/driversfd
+ @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \
+ ${.CURDIR}/${TARGET}/drivers.conf \
+ ${RD}/trees/base/boot/kernel ${RD}/driversfd
+ - at rmdir ${RD}/driversfd
+ if [ -d ${RD}/driversfd ]; then \
+ sh -e ${DOFS_SH} \
+ ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \
+ ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \
+ cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \
+ *.dsc >> ${RD}/floppies/DRIVERS.TXT; \
+ fi
+.endif
+ sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \
+ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
+ @gzip -9vc mfsroot > mfsroot.gz
+ @mkdir -p ${RD}/mfsroot
+ @cp mfsroot.gz ${RD}/mfsroot
+.if !defined(NO_FLOPPIES)
+.if defined(BOOTSIZE)
+ @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \
+ ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
+ @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
+.endif
+.if defined(SMALLBOOTSIZE)
+ @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
+.endif
+.if defined(BIGBOOTSIZE)
+ @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
+.endif
+.endif
+ @rm mfsroot mfsroot.gz
+ @echo "Regular and MFS boot floppies made."
+.endif
+ touch release.9.alpha
+
#
# --==## Create a fixit floppy ##==--
#
@@ -972,8 +1083,14 @@
md5 * > CHECKSUM.MD5) \
)
+.if ${TARGET_ARCH} == "alpha"
+RELEASE9=release.9.${TARGET_ARCH}
+.else
+RELEASE9=release.9
+.endif
+
doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \
- release.6 release.7 release.8 release.9 ${FIXIT_TARGET}
+ release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET}
@cd ${.CURDIR} && ${MAKE} ${EXTRAS}
@echo "Release done"
==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.146 2003/05/03 23:47:21 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -3397,13 +3397,26 @@
<para arch="i386,pc98,alpha">Floppy drives (&man.fdc.4; driver)</para>
<para arch="i386">Genius and Mustek hand scanners</para>
<para arch="i386">GPB and Transputer drivers</para>
+
+ <para arch="i386,pc98,alpha,ia64">VGA-compatible video cards
+ (&man.vga.4; driver)
+
+ <note>
+ <para>Information regarding specific video cards and
+ compatibility with <application>XFree86</application> can be
+ found at <ulink
+ url="http://www.xfree86.org/"></ulink>.</para>
+ </note>
+
+ </para>
+
<para arch="i386,pc98,alpha,ia64">Keyboards including:
<itemizedlist>
<listitem arch="i386,alpha">
- <para>AT-style keyboards</para>
+ <para>AT-style keyboards (&man.atkbd.4; driver)</para>
</listitem>
<listitem arch="i386,alpha,ia64">
- <para>PS/2 keyboards</para>
+ <para>PS/2 keyboards (&man.atkbd.4; driver)</para>
</listitem>
<listitem arch="pc98">
<para>Standard keyboards</para>
@@ -3415,22 +3428,30 @@
</itemizedlist>
</para>
<para arch="i386">Loran-C receiver (Dave Mills experimental hardware, loran driver).</para>
- <para arch="i386,pc98,alpha,ia64">Mice including:
+ <para arch="i386,pc98,alpha,ia64">Pointing devices including:
<itemizedlist>
<listitem arch="i386,pc98">
- <para>Bus mice (&man.mse.4; driver)</para>
+ <para>Bus mice and compatible devices (&man.mse.4; driver)</para>
</listitem>
<listitem arch="i386,alpha,ia64">
- <para>PS/2 mice (&man.psm.4; driver)</para>
+ <para>PS/2 mice and compatible devices, including many laptop
+ pointing devices (&man.psm.4; driver)</para>
</listitem>
<listitem>
- <para>Serial mice</para>
+ <para>Serial mice and compatible devices</para>
</listitem>
<listitem arch="i386,pc98,alpha">
<para>USB mice (specific instances are listed in the
section describing <link linkend="usb">USB devices</link>)</para>
</listitem>
</itemizedlist>
+
+ <note>
+ <para>&man.moused.8; has more information on using pointing
+ devices with &os;. Information on using pointing devices
+ with <application>XFree86</application> can be found at
+ <ulink url="http://www.xfree86.org/"></ulink>.</para>
+ </note>
</para>
<para arch="i386,alpha"><quote>PC standard</quote> parallel ports (&man.ppc.4; driver)</para>
==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -504,6 +504,14 @@
<para>&man.adduser.8; now supports a <option>-g</option> option to
set a user's default login group.</para>
+ <para>The &man.bsdlabel.8; utility is a replacement for the older
+ disklabel utility. Like its predecessor, it installs, examines,
+ or modifies the BSD label on a disk partition, and can install
+ bootstrap code. Compared to disklabel, a number of obsolete
+ options and parameters have been retired. A new
+ <option>-m</option> option instructs &man.bsdlabel.8; to use the
+ layout suitable for a specific machine.</para>
+
<para arch="alpha,i386">The <filename>compat4x</filename>
distribution now includes the
<filename>libcrypto.so.2</filename>,
@@ -526,16 +534,10 @@
information about a disk device and optionally to run a naive
performance test.</para>
- <para>The <option>-N</option> and <option>-W</option> flags to
- &man.disklabel.8; have been retired.</para>
-
- <para>&man.disklabel.8; is now only built for architectures where
- it is useful (i386, pc98, alpha, and ia64).</para>
+ <para>The disklabel utility has been replaced by &man.bsdlabel.8;.
+ On the alpha, i386, and pc98 platforms, disklabel is a link to
+ &man.bsdlabel.8;.</para>
- <para>The <option>-s</option> option to &man.disklabel.8; has been
- removed because the i386 boot loader now resides in a single
- file.</para>
-
<para>&man.dump.8; now supports caching of disk blocks with the
<option>-C</option> option. This can improve dump performance
at the cost of possibly missing file system updates that occur
@@ -655,12 +657,47 @@
unless UFS1 is specifically requested with the
<option>-O1</option> option.</para>
- <para>&man.newsyslog.8; now supports a <literal>W</literal> flag
- to force previously-started compression jobs for an entry (or
- group of entries specified with the <literal>G</literal> flag)
- to finish before beginning a new one. This feature is designed
- to prevent system overloads caused by starting several
- compression jobs on big files simultaneously. &merged;</para>
+ <para>&man.newsyslog.8; has a number of new features. Among them:
+
+ <itemizedlist>
+ <listitem>
+ <para>A <literal>W</literal> flag forces previously-started
+ compression jobs for an entry (or group of entries
+ specified with the <literal>G</literal> flag) to finish
+ before beginning a new one. This feature is designed to
+ prevent system overloads caused by starting several
+ compression jobs on big files
+ simultaneously. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <quote>default rotate action</quote>, to be used for
+ files specified for rotation but not specified in the
+ configuration file. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <option>-s</option> command-line flag to disable
+ sending signals to processes when rotating
+ files. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <literal>N</literal> configuration file flag to
+ indicate that no process needs to be signaled when
+ rotating a file. &merged;</para>
+ </listitem>
+
+ <listitem>
+ <para>A <literal>U</literal> configuration file flag to
+ specify that a process group (rather than a single
+ process) should be signaled when rotating
+ files. &merged;</para>
+ </listitem>
+
+ </itemizedlist>
+
+ </para>
<para>&man.nsdispatch.3; is now thread-safe and implements support
for Name Service Switch (NSS) modules. NSS modules may be
@@ -719,7 +756,7 @@
strengthened.</para>
<para arch="sparc64">The sunlabel utility, a program analogous to
- &man.disklabel.8; that works on Sun disk labels, has been
+ &man.bsdlabel.8; that works on Sun disk labels, has been
added.</para>
<para arch="i386,alpha,sparc64,ia64">&man.sysinstall.8; will now
==== //depot/projects/trustedbsd/base/release/scripts/doFS.sh#12 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/scripts/doFS.sh,v 1.49 2003/05/03 19:23:10 scottl Exp $
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.50 2003/05/09 09:41:18 scottl Exp $
#
set -ex
==== //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#16 (text+ko) ====
@@ -2,7 +2,7 @@
#
# Author: Jordan Hubbard
# Date: Mon Jul 10 01:18:20 2000
-# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.41 2003/03/03 03:28:30 murray Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list