From owner-svn-ports-head@freebsd.org  Sun Oct  8 18:57:10 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
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 D05EDE3D37D;
 Sun,  8 Oct 2017 18:57:10 +0000 (UTC)
 (envelope-from jbeich@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 5DBE66FAC0;
 Sun,  8 Oct 2017 18:57:10 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v98Iv9Lf028017;
 Sun, 8 Oct 2017 18:57:09 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v98Iv9K3028016;
 Sun, 8 Oct 2017 18:57:09 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201710081857.v98Iv9K3028016@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 8 Oct 2017 18:57:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451559 - head/x11/pixman
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/x11/pixman
X-SVN-Commit-Revision: 451559
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Oct 2017 18:57:11 -0000

Author: jbeich
Date: Sun Oct  8 18:57:09 2017
New Revision: 451559
URL: https://svnweb.freebsd.org/changeset/ports/451559

Log:
  x11/pixman: unbreak on armv7
  
  <instantiation>:1:1: error: unknown directive
  .func fname
  ^
  <instantiation>:4:1: note: while in macro instantiation
  pixman_asm_function fname
  ^
  pixman-arm-simd-asm-scaled.S:152:1: note: while in macro instantiation
  generate_nearest_scanline_func pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32
  ^
  <instantiation>:39:29: error: invalid immediate shift value
   and TMP1, VXMASK, VX, asr #(16 - bpp_shift)
                              ^
  pixman-arm-simd-asm-scaled.S:152:1: note: while in macro instantiation
  generate_nearest_scanline_func pixman_scaled_nearest_scanline_0565_0565_SRC_asm_armv6, 1, h, 80, 32
  ^

Modified:
  head/x11/pixman/Makefile   (contents, props changed)

Modified: head/x11/pixman/Makefile
==============================================================================
--- head/x11/pixman/Makefile	Sun Oct  8 18:56:58 2017	(r451558)
+++ head/x11/pixman/Makefile	Sun Oct  8 18:57:09 2017	(r451559)
@@ -25,7 +25,7 @@ MAKE_ARGS=      SUBDIRS=pixman
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 CONFIGURE_ENV+=	CCASFLAGS="${CFLAGS} -no-integrated-as"
 .endif