From owner-svn-ports-head@freebsd.org Wed Mar 27 11:50:27 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58374154D7B0; Wed, 27 Mar 2019 11:50:27 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDB3C71AA2; Wed, 27 Mar 2019 11:50:26 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D86C56C32; Wed, 27 Mar 2019 11:50:26 +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 x2RBoQ5x030063; Wed, 27 Mar 2019 11:50:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2RBoQxc030062; Wed, 27 Mar 2019 11:50:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903271150.x2RBoQxc030062@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 27 Mar 2019 11:50:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496945 - head/multimedia/dav1d X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/multimedia/dav1d X-SVN-Commit-Revision: 496945 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EDB3C71AA2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.991,0]; NEURAL_HAM_SHORT(-0.94)[-0.944,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 27 Mar 2019 11:50:27 -0000 Author: jbeich Date: Wed Mar 27 11:50:26 2019 New Revision: 496945 URL: https://svnweb.freebsd.org/changeset/ports/496945 Log: multimedia/dav1d: adjust r496941 for CFI (depends on LTO) Don't disable LTO, let assembly add padding to maintain alignment. https://chromium.googlesource.com/chromium/src.git/+/3a2c2029e0ee Modified: head/multimedia/dav1d/Makefile (contents, props changed) Modified: head/multimedia/dav1d/Makefile ============================================================================== --- head/multimedia/dav1d/Makefile Wed Mar 27 11:41:30 2019 (r496944) +++ head/multimedia/dav1d/Makefile Wed Mar 27 11:50:26 2019 (r496945) @@ -29,11 +29,6 @@ CFLAGS_armv6= -no-integrated-as -B${LOCALBASE}/bin CFLAGS_armv7= -no-integrated-as -B${LOCALBASE}/bin LDFLAGS_i386= -Wl,-z,notext -# https://bugs.llvm.org/show_bug.cgi?id=40635 -CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}_${ARCH}} -CFLAGS_clang_amd64= -fno-lto -CFLAGS_clang_i386= -fno-lto - OPTIONS_DEFINE= TEST TEST_GL_TUPLE= videolan:dav1d-test-data:3ccdd3df4fb8583d58bcc0101e315b00ec3ae130:testdata/tests/dav1d-test-data @@ -41,6 +36,13 @@ TEST_MESON_TRUE=build_tests testdata_tests .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" +.endif + +# https://bugs.llvm.org/show_bug.cgi?id=40635 +.if !empty(CFLAGS:M-flto*) +MESON_ARGS+= ${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}} +MESON_ARGS_clang_amd64= -Dstack_alignment=16 +MESON_ARGS_clang_i386= -Dstack_alignment=4 .endif pre-install-TEST-on: do-test