From patchwork Mon Sep 9 10:51:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Smith X-Patchwork-Id: 51475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1549933vqu; Mon, 9 Sep 2024 03:51:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUozKB+oBdKO9hox+VvXaN85Wh7dE1Is4uzyWCIJl8T9hF/wAl2u1/RjIlhPqmdU0TywNt6uJABk0lLUpbRp3h/@gmail.com X-Google-Smtp-Source: AGHT+IE2WHbQBd/lbKgVEjaveHsnfoqX0QHA0dJj+BDsb+cfIfsatJ11TWckog77R8owNx6cpEtI X-Received: by 2002:a2e:619:0:b0:2f6:1da6:1c64 with SMTP id 38308e7fff4ca-2f751f9a1a1mr50391921fa.45.1725879092452; Mon, 09 Sep 2024 03:51:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725879092; cv=none; d=google.com; s=arc-20240605; b=bcm7r0veDJvyH7pluNsmnG82fdgpryh1WWHGxT3Ly99no+H/z65lyfvpB8QyJhIYEb TeM77pyh/mN9STEAu7ar7L674s+1tPSVZPLJkOnRWeq/EzAGUGnKfzLCc9VMs6IcRRc/ EpxjTR9UQr6kJkfqm5wUVWaR1OTKt/+V/s0UxefpzbUEwq0MhQV7gNmf5xcvLIRuXoT+ rcHwIg/zgIED3qsfPo+3qquZxWzkbNt0plh4hbH6fDIkvaM0z4tHInjRWF+6SBjtqKKA ClF2w1eG2j+YxPmby8uwLxyoulZE7RBaOCcBoQ5lZjbrGYhBCNknahYq5Wnk8Za2aoJH kb5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:mime-version:message-id:to :from:date:domainkey-signature:dkim-signature:delivered-to; bh=FKQDZea8h5YNjrNO97JLAGFEjiF3fHlrgGxQZjMyO7U=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ETInXV3cPGFx+4KSO4Cmkq1Jk+BF8IxqpimPM2zzLaX2GIr33XscqgWIqoA3qMtG3v xjbq1OKz53qqT/tmX9he9vgZ7qKs0vhSPckRe7jmUR7HFZwDDDrONn6eU2on7d6Z/5Es wUMDSJKRIqdaJv/mKljyEl7pbWETU6I+fSA3elSXj5EvGOMosZzWukz2Zgc8eNXFM2lz 7RRZegyQbOvQtBoohKIdrbLofoQdoTcu0yd9DyxvvDqwtQNlJKJzLy3HlmgGmQ+suEsw 2womz5PP1bAp+1MwCK2CU07vOQSUtfvIWMBUbGL8Dmw5PR4mzhHiIpifJFPLxPf9Gb8D xDrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@comstyle.com header.s=default header.b=LTYvofsM; 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 38308e7fff4ca-2f75c0876cdsi13829181fa.373.2024.09.09.03.51.32; Mon, 09 Sep 2024 03:51:32 -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=@comstyle.com header.s=default header.b=LTYvofsM; 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 5AD8568DF87; Mon, 9 Sep 2024 13:51:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.comstyle.com (speedy.comstyle.com [206.51.28.2]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0834068DE5C for ; Mon, 9 Sep 2024 13:51:21 +0300 (EEST) Received: from mail.comstyle.com (localhost [127.0.0.1]) by mail.comstyle.com (Postfix) with ESMTP id 4X2NtJ0LWQz8PbP for ; Mon, 9 Sep 2024 06:51:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=comstyle.com; h=date :from:to:subject:message-id:mime-version:content-type; s= default; bh=AIBAzTgSk6M0kYINUHE5CCAI0K7gJCtOBSkleDX9mrs=; b=LTYv ofsMvQO/pIAEisWjwclqMaf0z3sYqxjBUGS9KE5T0SDaRCWejm3epETr6T1UDRXc Og+cesXaq7lcEkuA0ylMZ8R9WtyglywYQSgjlrp6XSmN3fUjrzEtJ1s5lRmM+wgd Nt83CKWbEDjNrRsy+7eCWRzWTJf0SU2H0cJXTZk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=comstyle.com; h=date:from:to :subject:message-id:mime-version:content-type; q=dns; s=default; b= jQaOby3OmFdoW35Wk8dmFTG2aEwnuNT9tdcCDPzYNSj9FcTxSLlCuZiDGDQaDR9r peb+CqTyPEPDDqGStBEh8Gd4XzIlAXijBF4QUwrFHGhdxOQfLkl8wC43zVQWHg2z LT0VBieDkEr2XJGW4KbK7ks+HK6hVO1W8LPmTQEyxBs= Received: from humpty.home.comstyle.com (unknown [IPv6:2001:470:b050:3:de8b:9db7:3d6c:50d4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (No client certificate requested) (Authenticated sender: brad) by mail.comstyle.com (Postfix) with ESMTPSA id 4X2NtH6t4Mz8PbN for ; Mon, 9 Sep 2024 06:51:19 -0400 (EDT) Date: Mon, 9 Sep 2024 06:51:18 -0400 From: Brad Smith To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline Subject: [FFmpeg-devel] aarch64: Implement support for elf_aux_info(3) on FreeBSD and OpenBSD 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: ClySdje1X9ai aarch64: Implement support for elf_aux_info(3) on FreeBSD and OpenBSD FreeBSD 12.0+, OpenBSD -current and what will be OpenBSD 7.6 support elf_aux_info(3). Signed-off-by: Brad Smith --- configure | 2 ++ libavutil/aarch64/cpu.c | 2 +- libavutil/cpu.c | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a8e67d230c..d3bd46f382 100755 --- a/configure +++ b/configure @@ -2367,6 +2367,7 @@ SYSTEM_FUNCS=" clock_gettime closesocket CommandLineToArgvW + elf_aux_info fcntl getaddrinfo getauxval @@ -6579,6 +6580,7 @@ check_func_headers mach/mach_time.h mach_absolute_time check_func_headers stdlib.h getenv check_func_headers sys/stat.h lstat check_func_headers sys/auxv.h getauxval +check_func_headers sys/auxv.h elf_aux_info check_func_headers sys/sysctl.h sysctlbyname check_func_headers windows.h GetModuleHandle diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c index 084c81e999..7631d13de0 100644 --- a/libavutil/aarch64/cpu.c +++ b/libavutil/aarch64/cpu.c @@ -20,7 +20,7 @@ #include "libavutil/cpu_internal.h" #include "config.h" -#if (defined(__linux__) || defined(__ANDROID__)) && HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO #include #include diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 61c1cf3faf..df00bd541f 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -49,7 +49,7 @@ #include #endif -#if HAVE_GETAUXVAL +#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO #include #endif @@ -292,6 +292,13 @@ unsigned long ff_getauxval(unsigned long type) { #if HAVE_GETAUXVAL return getauxval(type); +#elif HAVE_ELF_AUX_INFO + unsigned long aux = 0; + int ret = elf_aux_info(type, &aux, sizeof(aux)); + if (ret != 0) { + errno = ret; + } + return aux; #else errno = ENOSYS; return 0;