Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Feb 2017 23:20:12 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433339 - head/lang/gcc6-aux
Message-ID:  <201702042320.v14NKCJL033969@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Feb  4 23:20:12 2017
New Revision: 433339
URL: https://svnweb.freebsd.org/changeset/ports/433339

Log:
  lang/gcc6-aux: Add support for aarch64-*-freebsd*
  
  The resultant compiler passes all test except:
    * The stack-check related ones [1]
    * c34005o and c34007i [2]
  
  This should enable the full Ada framework, including Synth, on
  FreeBSD/ARM64.  I am not yet able to test this myself since I'm not part
  of the wheel group on the aarch64 reference machines.
  
  [1] I will look into providing the missing unwind support for aarch64
      which would be something to push upstream to gcc
  [2] I'll ask Adacore about these GNAT ICE (internal compiler errors) and
      open GCC PRs if necessary since they could affect other aarch64
      platforms.

Modified:
  head/lang/gcc6-aux/Makefile
  head/lang/gcc6-aux/distinfo

Modified: head/lang/gcc6-aux/Makefile
==============================================================================
--- head/lang/gcc6-aux/Makefile	Sat Feb  4 21:54:47 2017	(r433338)
+++ head/lang/gcc6-aux/Makefile	Sat Feb  4 23:20:12 2017	(r433339)
@@ -24,7 +24,7 @@ GARCH=			${ARCH:S/amd64/x86_64/}
 BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
 FULL_GNATGCC=		NOT_SET
-OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
+OS_LABEL4VERS=		[${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
 NO_MTREE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -49,13 +49,17 @@ BOOTSTRAP_DESC=		Create bootstrap compil
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
-ONLY_FOR_ARCHS=		amd64 i386
+ONLY_FOR_ARCHS=		amd64 i386 aarch64
 MODERN_BINUTILS=	yes
+.  if ${ARCH} == aarch64
+BOOTSTRAP_COMPILER=	ada-bootstrap.aarch64.freebsd.120.tar.bz2
+.  else
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
+.  endif
 .endif
 .if ${OPSYS} == DragonFly
 ONLY_FOR_ARCHS=		x86_64
-BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
+BOOTSTRAP_COMPILER=	ada-bootstrap.x86_64.dragonfly.41.tar.bz2
 .endif
 
 .if defined(MODERN_BINUTILS)
@@ -109,7 +113,8 @@ DISTFILES=	\
    ${IDENTIFICATION}.tar.bz2 \
    ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \
-   ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot
+   ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot \
+   ada-bootstrap.aarch64.freebsd.120.tar.bz2:boot
 .endif
 
 .if ${PORT_OPTIONS:MFORTRAN} && !${PORT_OPTIONS:MBOOTSTRAP}
@@ -204,7 +209,8 @@ post-extract:
 		-e 's;\@GCCAUX\@;${PORTNAME};' \
 		${WRKSRC}/gcc/config/dragonfly.h \
 		${WRKSRC}/gcc/config/i386/freebsd64.h \
-		${WRKSRC}/gcc/config/i386/freebsd.h
+		${WRKSRC}/gcc/config/i386/freebsd.h \
+		${WRKSRC}/gcc/config/aarch64/aarch64-freebsd.h
 .if defined(MODERN_BINUTILS)
 	# Use dwarf4-compatible addr2line (affects FreeBSD only)
 	${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \

Modified: head/lang/gcc6-aux/distinfo
==============================================================================
--- head/lang/gcc6-aux/distinfo	Sat Feb  4 21:54:47 2017	(r433338)
+++ head/lang/gcc6-aux/distinfo	Sat Feb  4 23:20:12 2017	(r433339)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1486228092
+TIMESTAMP = 1486228714
 SHA256 (gcc-6-20170202.tar.bz2) = 339411f9ec780ba1f779417ea2a3206b69ee11de293aea27fff4658d7e56d0c5
 SIZE (gcc-6-20170202.tar.bz2) = 95743873
 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3
@@ -7,3 +7,5 @@ SHA256 (ada-bootstrap.x86_64.dragonfly.4
 SIZE (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = 44956630
 SHA256 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 1066d7c5e71d78b4416de3b73348227678ca07db52488409e270db7b00467f55
 SIZE (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 42163803
+SHA256 (ada-bootstrap.aarch64.freebsd.120.tar.bz2) = 84d96268e864564bc4adddf54bac492ff74a0d7112c13283512542cde71663e7
+SIZE (ada-bootstrap.aarch64.freebsd.120.tar.bz2) = 53840614



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702042320.v14NKCJL033969>