From owner-svn-src-all@FreeBSD.ORG Tue May 22 18:30:14 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C4EAD106566B; Tue, 22 May 2012 18:30:14 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ADF8D8FC0C; Tue, 22 May 2012 18:30:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4MIUECp020233; Tue, 22 May 2012 18:30:14 GMT (envelope-from theraven@svn.freebsd.org) Received: (from theraven@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4MIUEtw020224; Tue, 22 May 2012 18:30:14 GMT (envelope-from theraven@svn.freebsd.org) Message-Id: <201205221830.q4MIUEtw020224@svn.freebsd.org> From: David Chisnall Date: Tue, 22 May 2012 18:30:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235798 - in stable/9: . contrib/libc++ contrib/libcxxrt etc/mtree lib lib/libc++ lib/libcxxrt share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2012 18:30:14 -0000 Author: theraven Date: Tue May 22 18:30:14 2012 New Revision: 235798 URL: http://svn.freebsd.org/changeset/base/235798 Log: Merged libcxxrt and libc++. Now available for testing on 9-stable with -stdlib=libc++. Changes to libstdc++ not yet merged, so it is not yet possible to mix libstdc++ and libc++ in the same program. Merged revisions: 226702,226785,227006,227755,227983,227987,228531,228630,228761,229067,230127,232950,233098,234715-234716,234772 Added: stable/9/contrib/libc++/ - copied from r235786, head/contrib/libc++/ stable/9/contrib/libcxxrt/ - copied from r235786, head/contrib/libcxxrt/ - copied from r227983, head/lib/libc++/ - copied from r227983, head/lib/libcxxrt/ stable/9/lib/libcxxrt/Version.map - copied, changed from r233174, head/lib/libcxxrt/Version.map Directory Properties: stable/9/lib/libc++/ (props changed) stable/9/lib/libcxxrt/ (props changed) Modified: stable/9/Makefile.inc1 (contents, props changed) stable/9/etc/mtree/BSD.include.dist stable/9/lib/Makefile stable/9/lib/libc++/Makefile stable/9/lib/libcxxrt/Makefile stable/9/share/mk/bsd.libnames.mk stable/9/share/mk/bsd.own.mk Directory Properties: stable/9/etc/ (props changed) stable/9/lib/ (props changed) stable/9/share/mk/ (props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Tue May 22 18:18:06 2012 (r235797) +++ stable/9/Makefile.inc1 Tue May 22 18:30:14 2012 (r235798) @@ -1235,6 +1235,9 @@ _startup_libs+= lib/csu/${MACHINE_CPUARC _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc +.if ${MK_LIBCPLUSPLUS} != "no" +_startup_libs+= lib/libcxxrt +.endif gnu/lib/libgcc__L: lib/libc__L Modified: stable/9/etc/mtree/BSD.include.dist ============================================================================== --- stable/9/etc/mtree/BSD.include.dist Tue May 22 18:18:06 2012 (r235797) +++ stable/9/etc/mtree/BSD.include.dist Tue May 22 18:30:14 2012 (r235798) @@ -76,6 +76,10 @@ tr1 .. .. + v1 + ext + .. + .. .. cam ata Modified: stable/9/lib/Makefile ============================================================================== --- stable/9/lib/Makefile Tue May 22 18:18:06 2012 (r235797) +++ stable/9/lib/Makefile Tue May 22 18:30:14 2012 (r235798) @@ -48,7 +48,9 @@ SUBDIR_ORDERED= ${_csu} \ libsbuf \ libtacplus \ libutil \ - ${_libypclnt} + ${_libypclnt} \ + ${_libcxxrt} \ + ${_libcplusplus} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ @@ -211,6 +213,11 @@ _libsmb= libsmb _libmp= libmp .endif +.if ${MK_LIBCPLUSPLUS} != "no" +_libcxxrt= libcxxrt +_libcplusplus= libc++ +.endif + .if ${MK_PMC} != "no" _libpmc= libpmc .endif Modified: stable/9/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Fri Nov 25 20:59:04 2011 (r227983) +++ stable/9/lib/libc++/Makefile Tue May 22 18:30:14 2012 (r235798) @@ -39,7 +39,7 @@ WARNS= 0 CXXFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -std=c++0x -nostdlib -DLIBCXXRT DPADD= ${LIBCXXRT} -LDADD= -L${.OBJDIR}/../libcxxrt/ -lcxxrt +LDADD= -lcxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXT @@ -58,6 +58,7 @@ STD_HEADERS= __bit_reference\ __tree\ __tuple\ __tuple_03\ + __undef_min_max\ algorithm\ array\ atomic\ Modified: stable/9/lib/libcxxrt/Makefile ============================================================================== --- head/lib/libcxxrt/Makefile Fri Nov 25 20:59:04 2011 (r227983) +++ stable/9/lib/libcxxrt/Makefile Tue May 22 18:30:14 2012 (r235798) @@ -21,6 +21,6 @@ SRCS+= libelftc_dem_gnu3.c\ WARNS= 0 CFLAGS+= -I${SRCDIR} -LDADD+= -pthread +VERSION_MAP= ${.CURDIR}/Version.map .include Copied and modified: stable/9/lib/libcxxrt/Version.map (from r233174, head/lib/libcxxrt/Version.map) ============================================================================== --- head/lib/libcxxrt/Version.map Mon Mar 19 11:53:33 2012 (r233174, copy source) +++ stable/9/lib/libcxxrt/Version.map Tue May 22 18:30:14 2012 (r235798) @@ -301,6 +301,11 @@ CXXRT_1.0 { "typeinfo name for std::exception"; "typeinfo name for std::type_info"; + "std::type_info::__is_function_p() const"; + "std::type_info::__do_upcast(__cxxabiv1::__class_type_info const*, void**) const"; + "std::type_info::__is_pointer_p() const"; + + "operator delete[](void*)"; "operator delete(void*)"; "operator new[](unsigned long)"; Modified: stable/9/share/mk/bsd.libnames.mk ============================================================================== --- stable/9/share/mk/bsd.libnames.mk Tue May 22 18:18:06 2012 (r235797) +++ stable/9/share/mk/bsd.libnames.mk Tue May 22 18:30:14 2012 (r235798) @@ -26,6 +26,8 @@ LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxm LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a +LIBCXXRT?= ${DESTDIR}${LIBDIR}/libcxxrt.a +LIBCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libc++.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a Modified: stable/9/share/mk/bsd.own.mk ============================================================================== --- stable/9/share/mk/bsd.own.mk Tue May 22 18:18:06 2012 (r235797) +++ stable/9/share/mk/bsd.own.mk Tue May 22 18:30:14 2012 (r235798) @@ -418,6 +418,7 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ ICONV \ IDEA \ + LIBCPLUSPLUS \ OFED \ SHARED_TOOLCHAIN @@ -572,6 +573,10 @@ MK_GDB:= no MK_CLANG_IS_CC:= no .endif +MK_LIBCPLUSPLUS?= no + +MK_LIBCPLUSPLUS?= no + # # Set defaults for the MK_*_SUPPORT variables. #