From patchwork Sat Nov 3 15:54:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Korb X-Patchwork-Id: 196862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 7D28C2C00DA for ; Sun, 4 Nov 2012 02:54:56 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1352562897; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=06dbEo3 5mUZMFslmZYfSK02CTOE=; b=cctCVSt/qUDBbr9CpVEjYzj09kqnL+NsHJFuWB+ q9uEpy6/wwMIKAD12QVM8Z+7l5mNzMViNoiTohY86rGIpt80cfGX3n1noev+On/3 cZwxs1+c8OYg+ZL8jMxPQ7bFSmtm4Ou2p9XqaTelmHxDgIY3SGPzWd0XY3aV+4Wh LcLs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=IziSFw4UUt3ps5d3lsi/GvcoM4BfGtRcHer9UGBKL8fDhxljJi81lR+3HfdhJt 9nm2aFrEypKhXlyzve9SQlzhTZP9fMvEUYmrmERQq+1D9DmVNHFOGkgVyOQ0NViG rpd3IS7QG/kuRc8n5UqWoiJ7a/hu/NpnAP2S+9DMKEsnc=; Received: (qmail 32369 invoked by alias); 3 Nov 2012 15:54:51 -0000 Received: (qmail 32361 invoked by uid 22791); 3 Nov 2012 15:54:49 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_CX, TW_DC, TW_GC X-Spam-Check-By: sourceware.org Received: from mail-wg0-f41.google.com (HELO mail-wg0-f41.google.com) (74.125.82.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 03 Nov 2012 15:54:45 +0000 Received: by mail-wg0-f41.google.com with SMTP id ds1so1312700wgb.2 for ; Sat, 03 Nov 2012 08:54:44 -0700 (PDT) Received: by 10.181.13.239 with SMTP id fb15mr6698632wid.22.1351958083862; Sat, 03 Nov 2012 08:54:43 -0700 (PDT) Received: from [192.168.10.2] (adsl-99-185-244-91.dsl.pltn13.sbcglobal.net. [99.185.244.91]) by mx.google.com with ESMTPS id dm3sm3314469wib.3.2012.11.03.08.54.41 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 08:54:43 -0700 (PDT) Message-ID: <50953E3F.2010900@gmail.com> Date: Sat, 03 Nov 2012 08:54:39 -0700 From: Bruce Korb User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121025 Thunderbird/16.0.2 MIME-Version: 1.0 To: GCC Patches Subject: VxWorks is done X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Index: gcc/gcov-io.c =================================================================== --- gcc/gcov-io.c (revision 193123) +++ gcc/gcov-io.c (working copy) @@ -92,7 +92,8 @@ { /* Read-only mode - acquire a read-lock. */ s_flock.l_type = F_RDLCK; - fd = open (name, O_RDONLY); + /* pass mode (ignored) for compatibility */ + fd = open (name, O_RDONLY, S_IRUSR | S_IWUSR); } else { Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog (revision 193123) +++ gcc/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2012-11-03 Robert Mason + + * gcov-io.c (gcov_open): Add file mode to open call (need for VxWorks) + 2012-11-03 Sandra Loosemore * doc/extend.texi: Copy-edit to use present tense except when Index: libstdc++-v3/config/os/vxworks/os_defines.h =================================================================== --- libstdc++-v3/config/os/vxworks/os_defines.h (revision 193123) +++ libstdc++-v3/config/os/vxworks/os_defines.h (working copy) @@ -33,4 +33,10 @@ // System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others. +//Keep vxWorks from defining min()/max() as macros +#ifdef NOMINMAX +#undef NOMINMAX +#endif +#define NOMINMAX 1 + #endif Index: libstdc++-v3/ChangeLog =================================================================== --- libstdc++-v3/ChangeLog (revision 193123) +++ libstdc++-v3/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2012-11-03 Robert Mason + + * config/os/vxworks/os_defines.h: + Keep vxWorks from defining min()/max() as macros + 2012-11-03 Jonathan Wakely * doc/html/*: Regenerate. Index: configure.ac =================================================================== --- configure.ac (revision 193123) +++ configure.ac (working copy) @@ -427,6 +427,15 @@ ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=yes) +AC_ARG_ENABLE(libstdcxx, +AS_HELP_STRING([--disable-libstdcxx], + [do not build libstdc++-v3 directory]), +ENABLE_LIBSTDCXX=$enableval, +ENABLE_LIBSTDCXX=default) +[if test "${ENABLE_LIBSTDCXX}" = "no" ; then + noconfigdirs="$noconfigdirs libstdc++-v3" +fi] + # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. libgcj_saved=$libgcj @@ -562,19 +571,22 @@ esac # Disable libstdc++-v3 for some systems. -case "${target}" in - *-*-vxworks*) - # VxWorks uses the Dinkumware C++ library. - noconfigdirs="$noconfigdirs target-libstdc++-v3" - ;; - arm*-wince-pe*) - # the C++ libraries don't build on top of CE's C libraries - noconfigdirs="$noconfigdirs target-libstdc++-v3" - ;; - avr-*-*) - noconfigdirs="$noconfigdirs target-libstdc++-v3" - ;; -esac +# Allow user to override this if they pass --enable-libstdc++-v3 +if test "${ENABLE_LIBSTDCXX}" = "default" ; then + case "${target}" in + *-*-vxworks*) + # VxWorks uses the Dinkumware C++ library. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + arm*-wince-pe*) + # the C++ libraries don't build on top of CE's C libraries + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + esac +fi # Disable Fortran for some systems. case "${target}" in Index: ChangeLog =================================================================== --- ChangeLog (revision 193123) +++ ChangeLog (working copy) @@ -1,3 +1,8 @@ +2012-11-03 Robert Mason + + * configure.ac: add --disable-libstdcxx configure option + and handle defaulted state only for VxWorks, ARM-wince-pe and AVR. + 2012-10-30 Ganesh Gopalasubramanian * MAINTAINERS (Write After Approval): Add myself.