From owner-svn-src-projects@FreeBSD.ORG  Thu Feb  7 00:48:43 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 576BA39D;
 Thu,  7 Feb 2013 00:48:43 +0000 (UTC)
 (envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3B1D6839;
 Thu,  7 Feb 2013 00:48:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r170mhfY032439;
 Thu, 7 Feb 2013 00:48:43 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r170mgT0032437;
 Thu, 7 Feb 2013 00:48:42 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201302070048.r170mgT0032437@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 7 Feb 2013 00:48:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246449 - in projects/bmake: . contrib/gnu-sort
 crypto/openssl/fips gnu/lib/libstdc++ gnu/usr.bin/sort lib/libc/arm
 sys/contrib/pf sys/i386/conf sys/netinet/ipfw
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 00:48:43 -0000

Author: obrien
Date: Thu Feb  7 00:48:42 2013
New Revision: 246449
URL: http://svnweb.freebsd.org/changeset/base/246449

Log:
  Correct the r242545 sync with head@242525.

Deleted:
  projects/bmake/contrib/gnu-sort/
  projects/bmake/crypto/openssl/fips/
  projects/bmake/gnu/usr.bin/sort/
  projects/bmake/sys/contrib/pf/
  projects/bmake/sys/netinet/ipfw/
Modified:
  projects/bmake/gnu/lib/libstdc++/Makefile
  projects/bmake/lib/libc/arm/Symbol.map
Directory Properties:
  projects/bmake/MAINTAINERS   (props changed)
  projects/bmake/contrib/bind9/   (props changed)
  projects/bmake/contrib/bzip2/   (props changed)
  projects/bmake/contrib/compiler-rt/   (props changed)
  projects/bmake/contrib/dialog/   (props changed)
  projects/bmake/contrib/gcc/   (props changed)
  projects/bmake/contrib/libarchive/   (props changed)
  projects/bmake/contrib/libarchive/cpio/   (props changed)
  projects/bmake/contrib/libarchive/libarchive/   (props changed)
  projects/bmake/contrib/libarchive/libarchive_fe/   (props changed)
  projects/bmake/contrib/libarchive/tar/   (props changed)
  projects/bmake/contrib/libc++/   (props changed)
  projects/bmake/contrib/llvm/   (props changed)
  projects/bmake/contrib/llvm/tools/clang/   (props changed)
  projects/bmake/contrib/netcat/   (props changed)
  projects/bmake/contrib/top/   (props changed)
  projects/bmake/crypto/openssh/   (props changed)
  projects/bmake/crypto/openssl/   (props changed)
  projects/bmake/gnu/lib/   (props changed)
  projects/bmake/gnu/usr.bin/binutils/   (props changed)
  projects/bmake/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/bmake/gnu/usr.bin/gdb/   (props changed)
  projects/bmake/lib/libc/   (props changed)
  projects/bmake/lib/libc/stdtime/   (props changed)
  projects/bmake/sys/boot/   (props changed)
  projects/bmake/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bmake/sys/conf/   (props changed)
  projects/bmake/sys/i386/conf/XENHVM   (props changed)
  projects/bmake/usr.bin/calendar/   (props changed)
  projects/bmake/usr.sbin/jail/   (props changed)
  projects/bmake/usr.sbin/ndiscvt/   (props changed)

Modified: projects/bmake/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/bmake/gnu/lib/libstdc++/Makefile	Thu Feb  7 00:36:00 2013	(r246448)
+++ projects/bmake/gnu/lib/libstdc++/Makefile	Thu Feb  7 00:48:42 2013	(r246449)
@@ -626,9 +626,5 @@ CLEANFILES+=	${VERSION_MAP}
 
 .include <bsd.lib.mk>
 
-.if ${MK_STAGING} == "yes"
-CXXFLAGS+= -I${STAGE_OBJTOP}${CXXINCLUDEDIR}/backward
-.endif
-
 # Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
 CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}

Modified: projects/bmake/lib/libc/arm/Symbol.map
==============================================================================
--- projects/bmake/lib/libc/arm/Symbol.map	Thu Feb  7 00:36:00 2013	(r246448)
+++ projects/bmake/lib/libc/arm/Symbol.map	Thu Feb  7 00:48:42 2013	(r246449)
@@ -37,6 +37,10 @@ FBSD_1.3 {
 	__flt_rounds;
 };
 
+FBSD_1.3 {
+	__flt_rounds;
+};
+
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;