From owner-svn-ports-head@freebsd.org Sat Nov 25 19:10:04 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D57DBDED9E6; Sat, 25 Nov 2017 19:10:04 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 AC9E66AAE1; Sat, 25 Nov 2017 19:10:04 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAPJA3vK084195; Sat, 25 Nov 2017 19:10:03 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAPJA3jR084193; Sat, 25 Nov 2017 19:10:03 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201711251910.vAPJA3jR084193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sat, 25 Nov 2017 19:10:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454891 - in head/lang/gcc5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/lang/gcc5: . files X-SVN-Commit-Revision: 454891 X-SVN-Commit-Repository: ports 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.25 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: Sat, 25 Nov 2017 19:10:04 -0000 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