From patchwork Wed Jan 26 22:44:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 33876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1924246iov; Wed, 26 Jan 2022 14:44:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSLuW0vppK7CFmIkvIK6h4p0llBTuSOGYqNcp8YqVG5YJAeg5NgM5bsRlyuYZbm+vYfKe2 X-Received: by 2002:a50:fe95:: with SMTP id d21mr1135692edt.76.1643237078782; Wed, 26 Jan 2022 14:44:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643237078; cv=none; d=google.com; s=arc-20160816; b=ERWaFO/QdUouJxUklupH9+yJoJvNl1JuASKBuW0Pvgc1H3Wr9Tqi2xE/eE2xuTs7pG X60w9NmgNE9o9Df1cqJTUq8gM1sGS5zTuMd/jXoKe0R9FtPd72ylcwxk0/Ajk9skFxHW aNDuRlMq2PnXFNbHXQoEfpbmfchumtXFXPV155xPUSw2LyOEIfpQxZoQ9fc1iXEffgqQ N0iatL4TXXVabFQSU3DespFKPynOCabomY/om3h0miJ7h8nkBB2IwAaLS0eanxtpuU8F 1nSw5XvroQ+xUbvi12j7ActgMSF6j0/aQZEWQHELNnEahMsw2RslA4jzLaCuebF3bIFy KAgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=KveW/ENh6Y9VqfUALd6r0QFl2UaNUpQa5PHNsGBqL8o=; b=IbU9N7Sx/TNEPmqZQ2GNNzTJZEIqbM2iB5EsaUgvsJe7buJRM4NlLzVeHKOnrG7mvc JlDo/GJvk4vg2gnMvMwbm7KsJFgGHFLIYmzHFHT4xllublgmSDPFQh1SHAJ9hH0mkEPc L93BA9KWUtJS8s2IQ8oGKTha1ZK89Ox/O0eDfaJGFBvWudg56MP6q7unBHHmyeew9Buh tAUemL2cCJcZprGFfsZOxRIGiL65p+ld8QVkGLa7w2MHRECO0Stk99oFLJUEueB1WiWl fMpDAlRDveBCHqKkrgWZiUKzSRdlBhg1gYP6FTV7Yjhr47I7E5qeMOOjUdaxOqqWv9X3 P2TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=WmbIFuSh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x1si321444edd.507.2022.01.26.14.44.38; Wed, 26 Jan 2022 14:44:38 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=WmbIFuSh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F1086802A5; Thu, 27 Jan 2022 00:44:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 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" X-TUID: yJQIzZJC2Yks 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. 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 \