From patchwork Tue Sep 6 13:42:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 37710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3272915pzh; Tue, 6 Sep 2022 06:42:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR7qGsP5A2nnQbbkqJblFbKfRGJbZ6pHGBppyONpRjrRPTnuRzjelqG/jG5GyjBx8b+IPouL X-Received: by 2002:a05:6402:1355:b0:44e:9e5c:e386 with SMTP id y21-20020a056402135500b0044e9e5ce386mr6530005edw.127.1662471771090; Tue, 06 Sep 2022 06:42:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662471771; cv=none; d=google.com; s=arc-20160816; b=qNulyRmTbkJ+5Szb4hKsShUlw+8rfwC26PHyGT9haiBRR3tFBVRP80INx9DblB/DmK LOD7OczqsanQmKjXgEO8e+PltuqMhlxOaGRrFbRX5YvZH91tpN/blWkd5J8dy4pJspjR eKBlkxhJDfopExjVBup61dwLAiiV2vX7rhl52DhnJnAIgsY1azLGHE/9WcDma2ABlD/d ThySGvcCW61TgtdoPMNetA/D79ul47/M68fgCjh6NZM1SmiQGOktSPIWCoM0OheeidP/ wvD/MneAq0Vb70DivQpqRAiCFkY+kWvtyfiGt8btKgmhVbD3MfNa4yMSGzF0c86HVC9F JECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=qhZQ5IfbMFnnZJ4p8/2x9OoxNFaWy4h8PnSddfa99Xc=; b=kgQbPNOW/Tnid1nJa/damvNqpg+YhXA0IZzniHZmGmJcR4Chd+7PbmbCZK/Fj/f7if geTvtLRLwTS1z5B3TtbxoStxBttldjq9u92ligpvB67QZcL5jswZYYGkxRRYIMUd7mkL 6p36TttwjNa+DLfvvrTLBNluo+sgJ0d0aChzcuzHQcuxGVoT1pFQdO0LgEbqJUZ7qu/q PQnDVv5qZ8yxzLT3SfT5wE/u3LM/LvkZ8vPU89MWjw743No7HsBGtf2vXb+TYM+tvlXE ezamX/VYgjLPhCZtL83vjtQ8uZ3wcEBrEB6KEaZuESqauPjwxxC++ZaNz/3TEzgJHV1m jiZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=5qgyGIN6; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z5-20020a05640235c500b0044ed9fe32f5si111388edc.533.2022.09.06.06.42.50; Tue, 06 Sep 2022 06:42:51 -0700 (PDT) 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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=5qgyGIN6; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A25968BB28; Tue, 6 Sep 2022 16:42:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F3CE68B9F2 for ; Tue, 6 Sep 2022 16:42:40 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id l12so3910917ljg.9 for ; Tue, 06 Sep 2022 06:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=VmeauUrf+ULmHw+sYlNK+hBxAFKWFcmFxSZyq0HsEMI=; b=5qgyGIN6ubJqG4SF7C49Dkk/bj+3O0nwuKbDSCaVKIUtBZskXfkHy7cfaUp8jRVdd8 NM41k2g3v3iJ62oxMgYBeUswZM9pcrRRj/bMGef2YVLvWcHxHxwj1GPI0zbY9zyxSXMD Iz+aUPv+9CLLw61KIp1ZoYXJb343FT6RjbkQY2uzRz5O3i3kDk3Up2rUoiogkof4s3p2 oKwr6KziVPEBUqaQPEphPacHyRPYjAJIBIU2q9zoi3Ojffb1fRzK28WRCecl8/vjYduZ Gxn3qYvltf8SZNBhuce7VfywRuNZY13oPzBz1W+QBVGHqHI4s3ZF4Nm9SS0paa0UczWX QSVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=VmeauUrf+ULmHw+sYlNK+hBxAFKWFcmFxSZyq0HsEMI=; b=a/OvJW05ylhn08NOIJX8cCDcEm64cP2oLB3N1Ss5f9Ni5twKh0TvRbpeQ1fiRQQjmU yv6+VhI2xeclagWtCAhw4Be0fbb1H5T+DhXdst68DDQGAtivmj0UX+1NHcPsdCz5vU1h XuMQ7cy1BghVCv6gbhxbXmpOLvrcMHtuv91E137+7A0ZH8i2GjjcBePEcaIKlkuBrQUU AxjhZbaFKrJmrl2PdDPn8RLUxEh4yBJvwEjmYjBL15H1yO/UHbLGauvKYZiI0JGRzF7B R62URoE3f+FcnNnfpEQJ1iufpS+YyQi3qYxJPZvYMIQT0oq8ZufD7o0+lyi0srk/4sYm lQBw== X-Gm-Message-State: ACgBeo10URCbS3oZFH0D2quRE3SoSBtRTdC3Uj2mpRShkHQoQ3Zhpgz/ Rk3xJq5tzIePtjTkEBOLUgTnJa1r8jrhuA0b X-Received: by 2002:a05:651c:b2c:b0:261:d30c:abc2 with SMTP id b44-20020a05651c0b2c00b00261d30cabc2mr17054838ljr.38.1662471760061; Tue, 06 Sep 2022 06:42:40 -0700 (PDT) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id e17-20020a05651c039100b00261eb44bd16sm1923737ljp.5.2022.09.06.06.42.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 06 Sep 2022 06:42:39 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 16:42:38 +0300 Message-Id: <20220906134238.91435-1-martin@martin.st> X-Mailer: git-send-email 2.32.1 (Apple Git-133) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] x86/tx_float: Fix building for platforms with a symbol prefix 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: fgL52INb21Pu This fixes building for x86 macOS (both i386 and x86_64) and i386 windows. --- v2: Add mangle() in a couple more places, that weren't noticed on i386 windows. --- libavutil/x86/tx_float.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 1b9131e7fa..69f67720c1 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -744,7 +744,7 @@ cglobal fft8_float, 4, 4, 6, ctx, out, in, tmp %if %1 cglobal fft8_ns_float, 4, 4, 6, ctx, out, in, tmp - call ff_tx_fft8_asm_float_sse3 + call mangle(ff_tx_fft8_asm_float_sse3) RET %endif %endmacro @@ -784,7 +784,7 @@ cglobal fft8_float, 4, 4, 4, ctx, out, in, tmp %if %1 cglobal fft8_ns_float, 4, 4, 4, ctx, out, in, tmp - call ff_tx_fft8_asm_float_avx + call mangle(ff_tx_fft8_asm_float_avx) RET %endif %endmacro @@ -833,7 +833,7 @@ cglobal fft16_float, 4, 4, 8, ctx, out, in, tmp %if %2 cglobal fft16_ns_float, 4, 4, 8, ctx, out, in, tmp - call ff_tx_fft16_asm_float_ %+ %1 + call mangle(ff_tx_fft16_asm_float_ %+ %1) RET %endif %endmacro @@ -917,7 +917,7 @@ cglobal fft32_float, 4, 4, 16, ctx, out, in, tmp %if %2 cglobal fft32_ns_float, 4, 4, 16, ctx, out, in, tmp - call ff_tx_fft32_asm_float_ %+ %1 + call mangle(ff_tx_fft32_asm_float_ %+ %1) RET %endif %endmacro @@ -1342,7 +1342,7 @@ cglobal fft_sr_ns_float, 4, 9, 16, 272, ctx, out, in, tmp, len, lut, itab, rtab, mov lutq, [ctxq + AVTXContext.map] mov tgtq, lenq - call ff_tx_fft_sr_asm_float_ %+ %1 + call mangle(ff_tx_fft_sr_asm_float_ %+ %1) RET %endif %endmacro