From patchwork Wed Oct 18 12:05:33 2023 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: 44290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3e0b:b0:15d:8365:d4b8 with SMTP id bk11csp1014767pzc; Wed, 18 Oct 2023 05:06:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpHJVKLs/lKNmg8GEf7/OeRk4RKO8jFGm6D6b2f9q5hS6Gly/ztb/EQmsC3HTh4aLG9siy X-Received: by 2002:a50:bae3:0:b0:532:c08a:eac0 with SMTP id x90-20020a50bae3000000b00532c08aeac0mr3274778ede.26.1697630768086; Wed, 18 Oct 2023 05:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697630768; cv=none; d=google.com; s=arc-20160816; b=WX4yYtGVNpc+SZ01LsDUSORzb62DqBieOPekCaos+mOGKcSnrii4/HVb261cYHsXqQ dzW+PeFqrgtZNEecDvCP+OzDBKwD1wQFSlLKHBOeyStppglguKrSHgxrshFp2zcqwzik bfx28y2C/o6AC/fSlE1ntf3qa2dwVc1EKS67ryBdp35FB1uFgc/Wuu+9RNFXRyJ8xbbf co0tU0mSCbinpAnhVoWpSDx3/DMU/Uxkb1MpvI6Ed5DwnYDS4PVwm1djKiti8jJmcInf y6AJprlg77Knpt0Kw77WagbzVXgITv4aLnOLYWbUHsHbXxT3ZGFw8MFZ9SIb8sV9wqNT ftuw== 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=LQbuBI+Wryq4gM2W3Ky+kz8VxMqR5IhfrXkdbx+2ftA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=H5rIXYUTHgKm7tgaj6Q352RFXVYwhLSTX2gXigVnN5AYYINj7cdT8A+OFkLAYmYY/Y n9W8U3vc6FJ944LicqR/s+OGVyS3sxORiaa2FjXCtL1ErDuGpjozYYCNwTU/N/Ar/Rmo w1202X7hgftry/XMNIXYvhloVnJGXj+ZbjTL7AkrGiuR/s0we3MkvbxfUXNvqWMw1ib4 t4hoJgk+Go4N7p7PxjTXy0s82wWsMRo9ElbE78Itwom5IVAaSGcWutjMTBfP4+pMVo4+ TGzw9I6IwXQQRSqxYmGsMVWfUVhEAF7GHEDnBfuoG7m97Vln7WpxKox1LQ1dcISTS82q 08XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=wJpo3k+C; 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 e19-20020a50d4d3000000b0053e60137fe7si1771130edj.455.2023.10.18.05.05.47; Wed, 18 Oct 2023 05:06:08 -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.20230601.gappssmtp.com header.s=20230601 header.b=wJpo3k+C; 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 B40BE68CA58; Wed, 18 Oct 2023 15:05:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC6E868C54C for ; Wed, 18 Oct 2023 15:05:36 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5041d6d8b10so9098945e87.2 for ; Wed, 18 Oct 2023 05:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1697630736; x=1698235536; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=FyvyuylyrcZ0Sa0xhbYd0X5F6r24+wD0q2O+2ZnMqS4=; b=wJpo3k+CalvBinNIFIKCV48y5w0H3aamXQA94MSHKZuS9LvAAbDEB/Hdg4NdXPE0h/ sWJ/wxnHQDcpWSOnShrwgCma+GCTQA9N70Lsh5ZdLgBDY1WaMgrfY5GrQX1OeTqBdu7w v9jt/o7JkWkbhy/9MJs7MMiHxhnKJA/q1rgHqsFDVgDoYu+ck1AEFVbg04Z2S420eCT1 1Cgfb6trfA+dOWxPDlePn2orR7nvkXmwJM5WQVsBW6x4/TeWEol7LA8WJq+gGWu/1jdR yclY76HhXc6AGb/8U9KR3PLCcSZt71hbkaH9+oUzUcrtbDc1E+25c0ixTojCiF9VTuLR mxww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697630736; x=1698235536; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FyvyuylyrcZ0Sa0xhbYd0X5F6r24+wD0q2O+2ZnMqS4=; b=vm81EHbV+v2/iw2YKKlR5BadOyBfnhUs8EM64cOj/MNpz3yc4HLgL1aXbemPnmQrKS QIknH1Phm2D+lqfs4uu6XN5Af6l2ENXjQiDCOAMV88fkIpzazdZ8/jjKWRowZ0LIXYXV anZ8KU9mpjCDqsAyiQqER7p2acscs4VP9qI6ATCk4GXb2eLNksSpTd2vPxYq+lxEqgxA PhU6vgUB8IoNPjgrmhOW58xRX9qK6mEto5UmZLNI+JTJNj1c9OIdT3j8XupSA5OFPNom yWiS2bpYD5qAbcEtBQiaPArApp0/NX65/m0hAmjN8UMfKPfBEZxjTAr5yVJu5j+sjyth TXsg== X-Gm-Message-State: AOJu0YyVleHls/Wq3T6UoDUN/bJ8l3H9MrmangO/nMhl8Bn9mNz7zfpm JfZ4XsH4yZPhzM+12k0vWG/4wWFXzlG+FiEb86J5ig== X-Received: by 2002:ac2:4304:0:b0:503:1c07:f7f9 with SMTP id l4-20020ac24304000000b005031c07f7f9mr4144714lfh.29.1697630735896; Wed, 18 Oct 2023 05:05:35 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id o7-20020ac25e27000000b00507a08f6605sm672209lfg.284.2023.10.18.05.05.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 05:05:35 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Oct 2023 15:05:33 +0300 Message-Id: <20231018120534.2720420-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] aarch64: Stop using asm/hwcap.h for the HWCAP_* detection 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: lURr5Fk+PcbU Including sys/auxv.h should be enough (it pulls in bits/hwcap.h, which provides the same defines). --- configure | 2 -- libavutil/aarch64/cpu.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index bc0c0bd4e4..4ab20c54ec 100755 --- a/configure +++ b/configure @@ -2202,7 +2202,6 @@ HAVE_LIST_PUB=" HEADERS_LIST=" arpa_inet_h - asm_hwcap_h asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h @@ -6453,7 +6452,6 @@ check_headers io.h enabled libdrm && check_headers linux/dma-buf.h -check_headers asm/hwcap.h check_headers linux/perf_event.h check_headers libcrystalhd/libcrystalhd_if.h check_headers malloc.h diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c index 2803b31443..bd780e8591 100644 --- a/libavutil/aarch64/cpu.c +++ b/libavutil/aarch64/cpu.c @@ -20,9 +20,8 @@ #include "libavutil/cpu_internal.h" #include "config.h" -#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL && HAVE_ASM_HWCAP_H +#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL #include -#include #include #define get_cpu_feature_reg(reg, val) \