From owner-svn-ports-head@FreeBSD.ORG Sun Apr 21 14:00:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D3376F85; Sun, 21 Apr 2013 14:00:09 +0000 (UTC) (envelope-from gerald@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 B5C2D1469; Sun, 21 Apr 2013 14:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3LE097G013607; Sun, 21 Apr 2013 14:00:09 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3LE09X2013603; Sun, 21 Apr 2013 14:00:09 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201304211400.r3LE09X2013603@svn.freebsd.org> From: Gerald Pfeifer Date: Sun, 21 Apr 2013 14:00:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316178 - in head/lang/gcc49: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Apr 2013 14:00:09 -0000 Author: gerald Date: Sun Apr 21 14:00:08 2013 New Revision: 316178 URL: http://svnweb.freebsd.org/changeset/ports/316178 Log: Update to the 20130414 snapshot of GCC 4.9.0. This requires a fix for libitm which didn't expect the OS to define __always_inline by itself (and differently). Also, this no longer installs libffi and its info and man pages which was always meant to remain for internal use only. Feature safe: yes Added: head/lang/gcc49/files/patch-libitm (contents, props changed) Modified: head/lang/gcc49/Makefile head/lang/gcc49/distinfo Modified: head/lang/gcc49/Makefile ============================================================================== --- head/lang/gcc49/Makefile Sun Apr 21 13:26:53 2013 (r316177) +++ head/lang/gcc49/Makefile Sun Apr 21 14:00:08 2013 (r316178) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.9.0.20130319 +PORTVERSION= 4.9.0.20130414 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -127,13 +127,8 @@ MAN1+= aot-compile${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-convert${SUFFIX}.1 \ rebuild-gcj-db${SUFFIX}.1 -MAN3= ffi${SUFFIX}.3 \ - ffi_call${SUFFIX}.3 \ - ffi_prep_cif${SUFFIX}.3 \ - ffi_prep_cif_var${SUFFIX}.3 INFO+= gcc${SUFFIX}/cp-tools \ - gcc${SUFFIX}/gcj \ - gcc${SUFFIX}/libffi + gcc${SUFFIX}/gcj PLIST_SUB+= JAVA="" .else CONFIGURE_ARGS+=--disable-libgcj Modified: head/lang/gcc49/distinfo ============================================================================== --- head/lang/gcc49/distinfo Sun Apr 21 13:26:53 2013 (r316177) +++ head/lang/gcc49/distinfo Sun Apr 21 14:00:08 2013 (r316178) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.9-20130319.tar.bz2) = 8c27127aef5f3cb516f7d091ce258d3cdb9075112dc38ed134669362f1b84158 -SIZE (gcc-4.9-20130319.tar.bz2) = 82611767 +SHA256 (gcc-4.9-20130414.tar.bz2) = 4c1dc6ac0406d381a5d21682baa499a6cadde802c23342de7d53a359aad6c482 +SIZE (gcc-4.9-20130414.tar.bz2) = 82820677 Added: head/lang/gcc49/files/patch-libitm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc49/files/patch-libitm Sun Apr 21 14:00:08 2013 (r316178) @@ -0,0 +1,87 @@ +2013-03-31 Gerald Pfeifer + + PR bootstrap/56714 + * local_atomic (__calculate_memory_order): Mark inline. + (atomic_thread_fence): Ditto. + (atomic_signal_fence): Ditto. + (atomic_bool::atomic_flag_test_and_set_explicit): Ditto. + (atomic_bool::atomic_flag_clear_explicit): Ditto. + (atomic_bool::atomic_flag_test_and_set): Ditto. + (atomic_bool::atomic_flag_clear): Ditto. + +Index: libitm/local_atomic +=================================================================== +--- libitm/local_atomic (revision 198109) ++++ libitm/local_atomic (working copy) +@@ -75,7 +75,7 @@ + memory_order_seq_cst + } memory_order; + +- __always_inline memory_order ++ inline __always_inline memory_order + __calculate_memory_order(memory_order __m) noexcept + { + const bool __cond1 = __m == memory_order_release; +@@ -85,13 +85,13 @@ + return __mo2; + } + +- __always_inline void ++ inline __always_inline void + atomic_thread_fence(memory_order __m) noexcept + { + __atomic_thread_fence (__m); + } + +- __always_inline void ++ inline __always_inline void + atomic_signal_fence(memory_order __m) noexcept + { + __atomic_thread_fence (__m); +@@ -1545,38 +1545,38 @@ + + + // Function definitions, atomic_flag operations. +- __always_inline bool ++ inline __always_inline bool + atomic_flag_test_and_set_explicit(atomic_flag* __a, + memory_order __m) noexcept + { return __a->test_and_set(__m); } + +- __always_inline bool ++ inline __always_inline bool + atomic_flag_test_and_set_explicit(volatile atomic_flag* __a, + memory_order __m) noexcept + { return __a->test_and_set(__m); } + +- __always_inline void ++ inline __always_inline void + atomic_flag_clear_explicit(atomic_flag* __a, memory_order __m) noexcept + { __a->clear(__m); } + +- __always_inline void ++ inline __always_inline void + atomic_flag_clear_explicit(volatile atomic_flag* __a, + memory_order __m) noexcept + { __a->clear(__m); } + +- __always_inline bool ++ inline __always_inline bool + atomic_flag_test_and_set(atomic_flag* __a) noexcept + { return atomic_flag_test_and_set_explicit(__a, memory_order_seq_cst); } + +- __always_inline bool ++ inline __always_inline bool + atomic_flag_test_and_set(volatile atomic_flag* __a) noexcept + { return atomic_flag_test_and_set_explicit(__a, memory_order_seq_cst); } + +- __always_inline void ++ inline __always_inline void + atomic_flag_clear(atomic_flag* __a) noexcept + { atomic_flag_clear_explicit(__a, memory_order_seq_cst); } + +- __always_inline void ++ inline __always_inline void + atomic_flag_clear(volatile atomic_flag* __a) noexcept + { atomic_flag_clear_explicit(__a, memory_order_seq_cst); } +