Merge remote-tracking branch 'upstream/master'

Makefile.inc1

@@ -1,6 +1,5 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.118 2008/06/24 20:22:30 thomas Exp $
 #
 # Build-time options are documented in make.conf(5).
 #
@@ -120,7 +119,7 @@ DESTDIRBASE?=		${OBJTREE}${.CURDIR}
 .MAKEFLAGS:=	${.MAKEFLAGS:NDESTDIR=*}
 
 # This sets the compiler we use to build the world/kernel with
-WORLD_CCVER?=	gcc41
+WORLD_CCVER?=	gcc44
 WORLD_BINUTILSVER?=	binutils217
 
 # temporary until everybody has converted to x86_64
@@ -794,12 +793,12 @@ bootstrap-tools:
 _share=	share/syscons/scrnmaps
 .endif
 
+.if !defined(NO_GCC41)
 _gcc41_cross= gnu/usr.bin/cc41
 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools
-.if !defined(NO_GCC44)
+.endif
 _gcc44_cross= gnu/usr.bin/cc44
 _gcc44_tools= gnu/usr.bin/cc44/cc_prep gnu/usr.bin/cc44/cc_tools
-.endif
 _custom_cross= libexec/customcc
 _binutils= gnu/usr.bin/${WORLD_BINUTILSVER}
 
@@ -851,14 +850,14 @@ hierarchy:
 # to specify the correct CCVER or 'cc' will not exec the correct compiler.
 #
 libraries:
+.if !defined(NO_GCC41)
 	cd ${.CURDIR}; \
 	    HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \
 		${MAKE} -f Makefile.inc1 _startup_libs41;
-.if !defined(NO_GCC44)
+.endif
 	cd ${.CURDIR}; \
 	    HOST_CCVER=${HOST_CCVER} CCVER=gcc44 \
 		${MAKE} -f Makefile.inc1 _startup_libs44;
-.endif
 	cd ${.CURDIR}; \
 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \

Makefile_upgrade.inc

@@ -1568,6 +1568,10 @@ TO_REMOVE+=/usr/share/man/cat/man9/kref_init.9.gz
 TO_REMOVE+=/usr/include/dev/video/meteor/meteor_reg.h
 TO_REMOVE+=/usr/share/man/cat4/i386/meteor.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/meteor.4.gz
+TO_REMOVE+=/usr/share/man/cat3/SLIST_REMOVE_NEXT.3.gz
+TO_REMOVE+=/usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
+TO_REMOVE+=/usr/share/man/cat3/STAILQ_REMOVE_NEXT.3.gz
+TO_REMOVE+=/usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 
 # XXX Remove when pfsync(4) has been fixed
 TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz

UPDATING

@@ -12,8 +12,23 @@
 +         UPGRADING DRAGONFLY FROM 2.8 to later versions                +
 +-----------------------------------------------------------------------+
 
+GCC 4.4
+-------
+
+GCC 4.4 has been made DragonFly's default compiler.
+
+That means that any settings that set CCVER to 'gcc44' are not needed
+anymore. Instead, CCVER can be set to 'gcc41' to go back to using
+GCC 4.1.
+
+The NO_GCC44 option has been removed and will not affect the build
+anymore. There is now a NO_GCC41 option that will prevent GCC 4.1 from
+building in a similar fashion.
+
+Note that you must do a full buildworld/buildkernel for upgrading.
+
 pkg_radd settings
-=================
+-----------------
 
 The config file for pkg_radd has moved from /etc/settings.conf to 
 /etc/pkg_radd.conf.  Save the contents of settings.conf before upgrading
@@ -26,14 +41,14 @@ exists.  pkg_radd will continue to work with defaults.
 +-----------------------------------------------------------------------+
 
 OpenSSL
-========
+--------
 
 OpenSSL has been upgraded, and SHLIB_MAJOR was bumped for libssh and libcrypto.
 This shouldn't break any 3rd-party software, but you'll need to recompile your
 3rd-party software if you want it to link against the new version of OpenSSL.
 
 Loader
-=======
+-------
 
 A new loader (dloader) has been added which better handles booting from
 multiple kernel/module versions.
@@ -51,7 +66,7 @@ Note that you must installworld and run the 'upgrade' target before
 installing the new kernel.
 
 BIND
-=====
+-----
 
 BIND has been removed from the base system.  The ldns and drill tools have 
 been added for basic functionality.  Use 'drill' where you would normally 

bin/ps/ps.c

@@ -602,6 +602,8 @@ pscomp(const void *arg_a, const void *arg_b)
 {
 	const KINFO *a = *(KINFO * const *)arg_a;
 	const KINFO *b = *(KINFO * const *)arg_b;
+	double di;
+	segsz_t si;
 	int i;
 
 #define VSIZE(k) (KI_PROC(k, vm_dsize) + KI_PROC(k, vm_ssize) + \
@@ -611,11 +613,23 @@ pscomp(const void *arg_a, const void *arg_b)
 	if (sortby == SORTIAC)
 		return (KI_PROC(a)->p_usdata.bsd4.interactive - KI_PROC(b)->p_usdata.bsd4.interactive);
 #endif
-	if (sortby == SORTCPU)
-		return (getpcpu(b) - getpcpu(a));
-	if (sortby == SORTMEM)
-		return (VSIZE(b) - VSIZE(a));
-	i =  KI_PROC(a, tdev) - KI_PROC(b, tdev);
+	if (sortby == SORTCPU) {
+		di = getpcpu(b) - getpcpu(a);
+		if (di < 0.0)
+			return(-1);
+		if (di > 0.0)
+			return(+1);
+		/* fall through */
+	}
+	if (sortby == SORTMEM) {
+		si = VSIZE(b) - VSIZE(a);
+		if (si < 0)
+			return(-1);
+		if (si > 0)
+			return(+1);
+		/* fall through */
+	}
+	i = KI_PROC(a, tdev) - KI_PROC(b, tdev);
 	if (i == 0)
 		i = KI_PROC(a, pid) - KI_PROC(b, pid);
 	return (i);

contrib/amd/libamu/mount_fs.c

@@ -694,7 +694,7 @@ compute_nfs_args(nfs_args_t *nap, mntent_t *mntp, int genflags, struct sockaddr_
 
 #if defined(MNT2_NFS_OPT_MAXGRPS) && defined(MNTTAB_OPT_MAXGROUPS)
   nap->maxgrouplist = hasmntval(mntp, MNTTAB_OPT_MAXGROUPS);
-  if (nap->maxgrouplist != NULL)
+  if (nap->maxgrouplist != 0)
     nap->flags |= MNT2_NFS_OPT_MAXGRPS;
 #endif /* defined(MNT2_NFS_OPT_MAXGRPS) && defined(MNTTAB_OPT_MAXGROUPS) */
 

contrib/gcc-4.4/gcc/config/i386/i386.c

@@ -28742,9 +28742,13 @@ ix86_mangle_type (const_tree type)
 static tree
 ix86_stack_protect_fail (void)
 {
+#if 0 /* XXX swildner */
   return TARGET_64BIT
 	 ? default_external_stack_protect_fail ()
 	 : default_hidden_stack_protect_fail ();
+#else
+  return default_external_stack_protect_fail ();
+#endif
 }
 
 /* Select a format to encode pointers in exception handling data.  CODE

contrib/gcc-4.4/gcc/tree-inline.c

@@ -3249,7 +3249,8 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id)
 	       && strlen (reason)
 	       && !lookup_attribute ("noinline", DECL_ATTRIBUTES (fn))
 	       /* Avoid warnings during early inline pass. */
-	       && cgraph_global_info_ready)
+	       && cgraph_global_info_ready
+	       && strcmp(reason, "call is unlikely and code size would grow"))
 	{
 	  warning (OPT_Winline, "inlining failed in call to %q+F: %s",
 		   fn, reason);

contrib/mdocml/ChangeLog.xsl

@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" >
+<xsl:output encoding="utf-8" method="html" indent="yes" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+<xsl:template match="/changelog">
+<html>
+	<head>
+		<title>mdocml - CVS-ChangeLog</title>
+		<link rel="stylesheet" href="index.css" type="text/css" media="all" />
+	</head>
+	<body>
+				<xsl:for-each select="entry">
+					<div class="clhead">
+						<xsl:text>Files modified by </xsl:text>
+						<xsl:value-of select="concat(author, ': ', date, ' (', time, ')')" />
+					</div>
+					<div class="clbody">
+						<strong>
+							<xsl:text>Note: </xsl:text>
+						</strong>
+						<xsl:value-of select="msg"/>
+						<ul class="clbody">
+							<xsl:for-each select="file">
+								<li>
+									<xsl:value-of select="name"/>
+									<span class="rev">
+										<xsl:text> &#8212; Rev: </xsl:text>
+										<xsl:value-of select="revision"/>
+										<xsl:text>, Status: </xsl:text>
+										<xsl:value-of select="cvsstate"/>
+										<xsl:if test="tag">
+											<xsl:text>, Tag: </xsl:text>
+											<xsl:value-of select="tag" />
+										</xsl:if>
+									</span>
+								</li>
+							</xsl:for-each>
+						</ul>
+					</div>
+				</xsl:for-each>
+	</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>