From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C6E5840609 for ; Wed, 26 Jan 2022 22:44:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 410C76801F4; Thu, 27 Jan 2022 00:44:34 +0200 (EET) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FD1168AF2A for ; Thu, 27 Jan 2022 00:44:28 +0200 (EET) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 156F710601EF for ; Wed, 26 Jan 2022 22:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1643237067; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=APNSfV75ol4ePAPmitRvVsk+R3WgjVgg2MVi2nZzYzo=; b=WmbIFuShqF/B0CN7L6oZEOPhfoBgpMme8I/eI1M8mLzpo9D+5aCeFArizIZ7sd9b Ji8jbj7JEAVMD9WPSppQCLEITMOhPmvtArAxldLuuiGL1C13UUo5+i2aFK/s3+tuQwX H3CKT9C22HMv8RxmQcgoLhiAY1nEhCl7cc7Oz2cprXwjX/jTXZEoj5emU9aSVs2nbau Zs6j6xtptQzpUGdz8rD9NGHhClz/+P+9h0MoXrrW2ZhKs+KB3Gi8HoxPAFfesIYoCVh 8lr6EJRgbWer6TOc1oizlB9DKWEcTpkCG6v7k/9joZ09VrEJf45LRI2O0psa0dHjPvP Pqw+ddaGUA== Date: Wed, 26 Jan 2022 23:44:27 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_111571_1104495200.1643237067816" Subject: [FFmpeg-devel] [PATCH] x86/tx_float: do not build tx_float_init.c if x86 assembly is disabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: ------=_Part_111571_1104495200.1643237067816 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit This broke builds with --disable-mmx, which also disabled assembly entirely, but ARCH_X86 was still true, so the init file tried to find assembly that didn't exist. Instead of checking for architecture, check if x86 assembly is enabled. Patch attached. ------=_Part_111571_1104495200.1643237067816 Content-Type: text/x-patch; charset=us-ascii; name=0001-x86-tx_float-do-not-build-tx_float_init.c-if-x86-ass.patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-x86-tx_float-do-not-build-tx_float_init.c-if-x86-ass.patch >From 97e91aea87876a542a0f075e7093708f38f38a8c Mon Sep 17 00:00:00 2001 From: Lynne Date: Wed, 26 Jan 2022 23:40:35 +0100 Subject: [PATCH] x86/tx_float: do not build tx_float_init.c if x86 assembly is disabled This broke builds with --disable-mmx, which also disabled assembly entirely, but ARCH_X86 was still true, so the init file tried to find assembly that didn't exist. Instead of checking for architecture, check if x86 assembly is enabled. --- libavutil/tx.c | 2 +- libavutil/x86/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavutil/tx.c b/libavutil/tx.c index cac7815231..5c1ac20c92 100644 --- a/libavutil/tx.c +++ b/libavutil/tx.c @@ -439,7 +439,7 @@ av_cold int ff_tx_init_subtx(AVTXContext *s, enum AVTXType type, ff_tx_codelet_list_double_c, ff_tx_codelet_list_int32_c, ff_tx_null_list, -#if ARCH_X86 +#if HAVE_X86ASM ff_tx_codelet_list_float_x86, #endif }; diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile index d747c37049..d66839e35d 100644 --- a/libavutil/x86/Makefile +++ b/libavutil/x86/Makefile @@ -3,7 +3,8 @@ OBJS += x86/cpu.o \ x86/float_dsp_init.o \ x86/imgutils_init.o \ x86/lls_init.o \ - x86/tx_float_init.o \ + +OBJS-$(HAVE_X86ASM) += x86/tx_float_init.o \ OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \ -- 2.34.1 ------=_Part_111571_1104495200.1643237067816 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". ------=_Part_111571_1104495200.1643237067816--