Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Nov 2017 19:10:03 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r454891 - in head/lang/gcc5: . files
Message-ID:  <201711251910.vAPJA3jR084193@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sat Nov 25 19:10:03 2017
New Revision: 454891
URL: https://svnweb.freebsd.org/changeset/ports/454891

Log:
  Add support for armv7. [1]
  
  Rework the architecture-specific special settings, sorting snippets and
  using .elif instead of distinct .if sequences.
  
  Tested by:	andreast [1]

Added:
  head/lang/gcc5/files/patch-armv7-support
     - copied unchanged from r454797, head/lang/gcc6/files/patch-armv7-support
Modified:
  head/lang/gcc5/Makefile

Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile	Sat Nov 25 18:39:42 2017	(r454890)
+++ head/lang/gcc5/Makefile	Sat Nov 25 19:10:03 2017	(r454891)
@@ -53,13 +53,8 @@ CONFIGURE_ARGS+=	--disable-multilib
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
-.endif
 
-.if ${ARCH} == powerpc64
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
-.endif
-
-.if ${ARCH} == aarch64 || ${ARCH} == armv6
+.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 . if ${COMPILER_TYPE} == clang
 .  if empty(PORT_OPTIONS:MBOOTSTRAP)
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
@@ -67,6 +62,9 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512
 .  endif
 . endif
+
+.elif ${ARCH} == powerpc64
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran

Copied: head/lang/gcc5/files/patch-armv7-support (from r454797, head/lang/gcc6/files/patch-armv7-support)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/gcc5/files/patch-armv7-support	Sat Nov 25 19:10:03 2017	(r454891, copy of r454797, head/lang/gcc6/files/patch-armv7-support)
@@ -0,0 +1,28 @@
+--- UTC
+--- gcc/config.gcc.orig	2017-01-09 22:01:26.582656000 +0100
++++ gcc/config.gcc	2017-10-07 17:27:59.564810000 +0200
+@@ -1072,6 +1072,10 @@
+                tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+             fi
+ 	    ;;
++	armv7*-*-freebsd*)
++	    tm_defines="${tm_defines} TARGET_FREEBSD_ARMv7=1"
++            tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
++	    ;;
+ 	esac
+ 	with_tls=${with_tls:-gnu}
+ 	;;
+--- gcc/config/arm/freebsd.h.orig	2016-06-15 21:17:15.860618000 +0200
++++ gcc/config/arm/freebsd.h	2017-10-09 21:38:03.395632000 +0200
+@@ -112,7 +112,10 @@
+ #undef  WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE BITS_PER_WORD
+ 
+-#if defined (TARGET_FREEBSD_ARMv6)
++#if defined (TARGET_FREEBSD_ARMv7)
++#undef  SUBTARGET_CPU_DEFAULT
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_genericv7a
++#elif defined (TARGET_FREEBSD_ARMv6)
+ #undef  SUBTARGET_CPU_DEFAULT
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm1176jzs
+ #else



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