From owner-svn-ports-all@freebsd.org  Sun Dec  3 13:33:04 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 3F147DFBBDC;
 Sun,  3 Dec 2017 13:33: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 0C09A791EF;
 Sun,  3 Dec 2017 13:33:03 +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 vB3DX3QU076421;
 Sun, 3 Dec 2017 13:33:03 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB3DX3Ub076420;
 Sun, 3 Dec 2017 13:33:03 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <201712031333.vB3DX3Ub076420@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 3 Dec 2017 13:33:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455404 - head/lang/gcc7
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/lang/gcc7
X-SVN-Commit-Revision: 455404
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Dec 2017 13:33:04 -0000

Author: gerald
Date: Sun Dec  3 13:33:02 2017
New Revision: 455404
URL: https://svnweb.freebsd.org/changeset/ports/455404

Log:
  Remove special code handling armv7 and armv6 (which for GCC 6 and
  5-based ports is necessary for aarch64, armv6 and armv7, but that
  we do not need for newer ports). [1]
  
  Shorten the distinct .if statements for architecture-specific settings,
  to use .elif instead.
  
  Consulted with:	andreast [1]

Modified:
  head/lang/gcc7/Makefile

Modified: head/lang/gcc7/Makefile
==============================================================================
--- head/lang/gcc7/Makefile	Sun Dec  3 12:48:30 2017	(r455403)
+++ head/lang/gcc7/Makefile	Sun Dec  3 13:33:02 2017	(r455404)
@@ -55,21 +55,10 @@ CONFIGURE_ARGS+=	--disable-multilib
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
-.endif
 
-.if ${ARCH} == powerpc64
+.elif ${ARCH} == powerpc64
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 USE_GCC=	yes
-.endif
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-. if ${COMPILER_TYPE} == clang
-.  if empty(PORT_OPTIONS:MBOOTSTRAP)
-MAKE_ARGS+=CXXFLAGS+=-fbracket-depth=512
-.  else
-MAKE_ARGS+=STAGE1_CXXFLAGS+=-fbracket-depth=512
-.  endif
-. endif
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran