Index: head/multimedia/dav1d/Makefile
===================================================================
--- head/multimedia/dav1d/Makefile	(revision 496944)
+++ head/multimedia/dav1d/Makefile	(revision 496945)
@@ -1,48 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	dav1d
 DISTVERSION=	0.2.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Small and fast AV1 decoder
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	as:devel/binutils
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_armv6=	${LOCALBASE}/bin/as:devel/binutils
 BUILD_DEPENDS_armv7=	${LOCALBASE}/bin/as:devel/binutils
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		compiler:c11 meson
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
 GL_COMMIT=	408d0486889f4f6d92f73abdeaef250659a10bc7
 CONFIGURE_ENV=	UNAME_m=${ARCH} # XXX cpu_family()
 CFLAGS_aarch64=	-no-integrated-as
 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
 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
 
 .include <bsd.port.mk>