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 735F94060D for ; Wed, 26 Jan 2022 22:50:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1342068AEE0; Thu, 27 Jan 2022 00:50:38 +0200 (EET) Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1429968A77A for ; Thu, 27 Jan 2022 00:50:32 +0200 (EET) Received: by mail-oo1-f45.google.com with SMTP id r15-20020a4ae5cf000000b002edba1d3349so210657oov.3 for ; Wed, 26 Jan 2022 14:50:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=SOS1HmTw0GPVqHknTCPMa4uAbRrjJqwgkHwSp72fRHA=; b=Z30mZ48R01uso3o3rahj6LGM2PT6hurKo0Ee2WRZhnbQ9F772I61+48EI6j9w2VcW5 epfFED21Qt+MB1X9Pdf6lVuqdKCmKSjrSk+uY+eT8EJB/SloODaOrFL4bO1vtf5OWEdo 5uHJ2dDxLtbDV5ceL+QXjvRVFlGxRKzuYidQdY1Zhwvaeggwrn8yuVUaQsCQ7VwaYwO+ d+R45VVvDLEpF0BTSe3xbS1g1zSfIs1mrHykphTtXD7gujjG/KTNnCkGfydQ9m4hhsQn Eaeliou7WcpT7rFBv5iJz/HeAwGMSJXm58855J5GCiQueQTgS5cri5K+LPbP3o1RQSBF ULSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=SOS1HmTw0GPVqHknTCPMa4uAbRrjJqwgkHwSp72fRHA=; b=c5/ru0EtdMtGu3vJgUXHQkDoXFwZlcwJQOuMBkCj/ly/iP6f+zYOK8bfW9mMWTfq1U 24iHcnLO/aMmSVHX+iVD0y5kVQTNDLbBwj51v82a3/95rrasmRiI58YcfO90918Df1Fz kvd5rLelHWrmSS/CB6ez4cF1ekNg8inv7+EoqOx/U+leqE14d2BSdtM3oRUSYf1iAmo3 xelNCnojvFGK791w5LS/XDKIgnF563fOtFkUxQa+H4SLSJ3j2wf8AsP5s6SDdJveD226 CmSqfcNjIkvaxPU61gOq3xmU1yS4AjKGhZruBWmxNIffX4/u5SlKMgnmfvzVYvnrMWQl WeRQ== X-Gm-Message-State: AOAM5332P9lQzmLU/tV0Vrw1xMmz5QOoUuPKau2gJLqx4Do2DYiV3c12 iwCPeEAg0YlgXf60Uv1k9agbj7hzA6o= X-Google-Smtp-Source: ABdhPJzq05CnABBuc50/7W8ydD1DxXJnEd5tHW33dwoUUI2WusJwfyh3rR9XcVX035LUqSTAzpD34g== X-Received: by 2002:a05:6820:23a:: with SMTP id j26mr676639oob.2.1643237430176; Wed, 26 Jan 2022 14:50:30 -0800 (PST) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id x1sm3549949oto.38.2022.01.26.14.50.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Jan 2022 14:50:29 -0800 (PST) Message-ID: Date: Wed, 26 Jan 2022 19:50:27 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 1/26/2022 7:44 PM, Lynne wrote: > 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. > 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 \ This is not how we normally handle things. Init files for a given target arch should compile regardless of what is enabled at configure time. DCE with all the EXTERNAL_ checks should take care of not referencing symbols that nasm will not assemble. > > OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \ > > -- > 2.34.1 > _______________________________________________ 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".