From owner-svn-ports-head@FreeBSD.ORG Fri Nov 28 12:43:04 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72CAD820; Fri, 28 Nov 2014 12:43:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 452E426C; Fri, 28 Nov 2014 12:43:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASCh47e095608; Fri, 28 Nov 2014 12:43:04 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASCh3po095606; Fri, 28 Nov 2014 12:43:03 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201411281243.sASCh3po095606@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 28 Nov 2014 12:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373563 - head/lang/gcc-aux 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.18-1 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: Fri, 28 Nov 2014 12:43:04 -0000 Author: marino Date: Fri Nov 28 12:43:03 2014 New Revision: 373563 URL: https://svnweb.freebsd.org/changeset/ports/373563 QAT: https://qat.redports.org/buildarchive/r373563/ Log: lang/gcc-aux: Fix symbolic trace on FreeBSD Recent gcc creates debug information in dwarf4 format, something that the base version of addr2line on FreeBSD cannot understand. When the compiler requires binutils from ports to build, then ensure the symbolic tracing code also uses addr2line from the same binutils (which is already available due to RUN_DEPENDS requirements). Since DragonFly 3.6 and lower are no longer officially supported, this change only affects FreeBSD, but it affects all supported releases. The conditional code for DragonFly 3.6 has been removed while here. Reported by: Natacha Porte PR: 195465 Modified: head/lang/gcc-aux/Makefile head/lang/gcc-aux/Makefile.version Modified: head/lang/gcc-aux/Makefile ============================================================================== --- head/lang/gcc-aux/Makefile Fri Nov 28 12:02:35 2014 (r373562) +++ head/lang/gcc-aux/Makefile Fri Nov 28 12:43:03 2014 (r373563) @@ -56,9 +56,6 @@ BOOTSTRAP_COMPILER= ada-bootstrap.${GARC . endif .endif .if ${OPSYS} == DragonFly -. if ${OSREL:S/.//} < 37 -MODERN_BINUTILS= yes -. endif BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2 .endif @@ -218,6 +215,11 @@ post-extract: ${WRKSRC}/gcc/config/dragonfly.h \ ${WRKSRC}/gcc/config/i386/freebsd64.h \ ${WRKSRC}/gcc/config/i386/freebsd.h +.if defined(MODERN_BINUTILS) + # Use dwarf4-compatible addr2line (affects FreeBSD only) + ${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \ + ${WRKSRC}/gcc/ada/traceback_symbolic.c +.endif do-configure: ${MKDIR} ${BUILDDIR} Modified: head/lang/gcc-aux/Makefile.version ============================================================================== --- head/lang/gcc-aux/Makefile.version Fri Nov 28 12:02:35 2014 (r373562) +++ head/lang/gcc-aux/Makefile.version Fri Nov 28 12:43:03 2014 (r373563) @@ -4,7 +4,7 @@ GCC_BRANCH= 4.9 GCC_POINT= 2 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} SNAPSHOT= 20141023 -MAIN_PR= 0 +MAIN_PR= 1 UTIL_PR= 0 ARMV5_PR= 0 ARMV7_PR= 0