From patchwork Mon Nov 15 12:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brilliantov Kirill Vladimirovich X-Patchwork-Id: 31426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp5757976iob; Mon, 15 Nov 2021 04:24:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeIxAxBw4OynREZQB9VlY3RgcV98UEr5txKU9TuWqMXOAKmrKfsf+gfnoAjtuW0a4bhjbN X-Received: by 2002:a05:6402:42c6:: with SMTP id i6mr11811340edc.223.1636979061816; Mon, 15 Nov 2021 04:24:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636979061; cv=none; d=google.com; s=arc-20160816; b=WQ5DNtNW9RuopuAIAyGutkfd9rHGyosJabPmFVvdbTOBKe98JMyiwqFiC0eZyMv7we tUexjLPyO6T2B2xaqIn+NE3opqaiFpvj67baY04hEXic1Kbz7CQwUKLRpa5ZEGbz9b0+ 4S/7mlhxuKy9E4DL15H2Ksn/S491jcmc6hvMunLOfyASpmgbz1aE/3t97VGwI92ftIlH 4BdgfE908RqE/GO6/egsqfF8cRYBnIVNvZcg0WqA3255mogr3Li/LUQvP8cRtF/JM42/ McDtmleqi6hM64/GmvDb1CSrokw+8xaOgLFkzh+NomNKVBNDAGE9B1saJBTh+rFJ/PHm 62og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=kT0zlyfEXrXUOUMKA+sKh8qpVB+Sn5H682Iy7DvcJTg=; b=XRIBk8y6FHYa1zEcso+nnlt5W5CK9oTdwcbYSjTpwO3B/D2aV4vzkyUM9TOSqnxuGk LLeN1GO5uYJWh3FiDkWkysQxsVtvB/eHUI4/bdqDlxvMADhCb6wNN2Q/ntc4XBxZLaZI ZjUK+YYvKZ7UgVdvFCphn+XOUPmuBU9MuDitv5UBPRZJBKa6mHjTNEKVP1X3wUA2D8Rz r0jKRl0hEoQZruKSDImOtdYnVK96MxRygQExp5eJVfF62iR1RCOeLPDG18Kl05BFqu2H /C3t0nd0JSdfIgg86FO2EJLg2d6bmVvF18gcwV+jUnpVO6o3FvbLCYC/2sRr1e6hUIPi 6BtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@inbox.ru header.s=mail4 header.b=DHhvO6KJ; 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 h13si925694ede.32.2021.11.15.04.24.18; Mon, 15 Nov 2021 04:24:21 -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=@inbox.ru header.s=mail4 header.b=DHhvO6KJ; 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 12FA768AD93; Mon, 15 Nov 2021 14:24:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D38CB68A8F1 for ; Mon, 15 Nov 2021 14:24:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail4; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=J3Vxi5Kh2hhawPJP2I0qEZeqfTouWeTPu8h3kchmNNM=; t=1636979052;x=1637584452; b=DHhvO6KJI61svnahCGGEaFvociZsIGiwYKYZpYEuhELbzhnoSdsNpwL8zkC7ZzZ3ufG94zhsC9zSIGFHYjoAFc69g7g5l8S3899XznIWnW0AISXURMuu/UqiN7e/ZzvIvfOd6fR8/qHluvVzuemJiH6ATei+gJtrHEoRSIHJn406Kb+vRR3/N2q+UA4WfUSYfE3OyMmkHw6EpyAdp0hxPCcyP23GvTz6cOfy0D5A1NdZ/saLytBbF1/YuPM3sTQPcj3Zs5Wroiq4fp4LSI8QPcP3cExJUkfodZjOph7XlwLVvptsnKo8uKsqCc5IkEF/DyP1ZGOoLtIcd/2HE/gq0A==; Received: by smtp53.i.mail.ru with esmtpa (envelope-from ) id 1mmb1q-00032L-6t; Mon, 15 Nov 2021 15:24:06 +0300 From: Brilliantov Kirill Vladimirovich To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Nov 2021 15:23:42 +0300 Message-Id: <20211115122343.2421-1-brilliantov@inbox.ru> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Authentication-Results: smtp53.i.mail.ru; auth=pass smtp.auth=brilliantov@inbox.ru smtp.mailfrom=brilliantov@inbox.ru X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD927BBD05C2915ABC3B762B5D3D830D10BDB6360B3AB5A2210182A05F5380850404C228DA9ACA6FE272000E0E9198493CE7F9D93BDA48B5CE93BEB25269FF2D4F1AB1B8A2365B7B527 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7B9D6DADD6B53929DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063721BEEAF38C6AE0B78638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E0A2F6092635B34D6FD2E0D5459BFADB6F9789CCF6C18C3F8528715B7D10C86859CC434672EE6371117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC1F8789D36234D406A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18BDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE22A4E020D69BCAC128F6BDBBAB179F4ED8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE355C9F8201572E6EC03F1AB874ED89028C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637368BCC681386E289EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50599CBE9AF9FB6D19B52E168B644F3F02D X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CA6674D4217F8769DE3C769EC2D121A340FE1DC3CBD1E7AE79C2B6934AE262D3EE7EAB7254005DCEDDBDC74B9E4FDBD701E0A4E2319210D9B64D260DF9561598F01A9E91200F654B017A45118377F5F9E8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D95739AEDB3821B433BA1E92379DAFAA54C61905E672CA003F04D613DDB88EA4B1EB7A10354A0F821D7E09C32AA3244C1DE5363D0B79EE8B89C1B3F29D8E3B26BBA718C7E6A9E042729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojjLiSo6osCe5Y1QxU6CQ7Aw== X-Mailru-Sender: 6FF5604FD5B2EFE55BCD4A77EB979396FD3543B8862A022FCCEAEE833433CA7089E23A9B5BA4347B03D8EB94FCA8B4D978274A4A9E9E44FDAB6B9D6FEFF52F1842BCDBF1A3B2F4A067EA787935ED9F1B X-Mras: Ok Subject: [FFmpeg-devel] [PATCH] libavutil/mips: fix build if sys/auxv.h not present 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 Cc: Brilliantov Kirill Vladimirovich Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Zkk2erFcbXKP --- configure | 1 + libavutil/mips/cpu.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/configure b/configure index 98113c95fd..18c93f2619 100755 --- a/configure +++ b/configure @@ -2148,6 +2148,7 @@ HEADERS_LIST=" valgrind_valgrind_h windows_h winsock2_h + sys_auxv_h " INTRINSICS_LIST=" diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c index 59619d54de..854eabfc18 100644 --- a/libavutil/mips/cpu.c +++ b/libavutil/mips/cpu.c @@ -23,7 +23,9 @@ #include #include #include +#if HAVE_SYS_AUXV_H #include +#endif #include "asmdefs.h" #include "libavutil/avstring.h" #endif @@ -34,7 +36,11 @@ static int cpucfg_available(void) { +#if HAVE_SYS_AUXV_H return getauxval(AT_HWCAP) & HWCAP_LOONGSON_CPUCFG; +#else + return 0; +#endif } /* Most toolchains have no CPUCFG support yet */