svn commit: r373563 - head/lang/gcc-aux

[John Marino]

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