From patchwork Sun Oct 15 03:27:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean McGovern X-Patchwork-Id: 44264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b15:b0:15d:8365:d4b8 with SMTP id fp21csp1858891pzb; Sat, 14 Oct 2023 20:27:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMlFMNsET2EUtSx+Hl8yhtN0fubbPDj5wMf5zy4ij9XIvx82xLzxu89/ohdsQ8CwOpkFS7 X-Received: by 2002:a05:6402:22d1:b0:53d:ea2a:38e with SMTP id dm17-20020a05640222d100b0053dea2a038emr8252758edb.37.1697340461151; Sat, 14 Oct 2023 20:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697340461; cv=none; d=google.com; s=arc-20160816; b=aWzQRSYXgJ74LF86IlqXddJLLySJVYXqkUgGDycL3gDjR346iNTq3UI9WWa2czYEmw n7PhEHm29ur6hsjD4a9FfC8nawsuR8MFHGtkRg0kVl1xqJ/H6WIVXA5qx/iLV8a7Ew/B u5sQZkqzUspbw2tgU4vst0/tVyU5OFuqTpN2mzbBLpV7sr/VI3GMngi8zek2mRd8eDr6 RcTrDdc2K/L2YNNAB/kugeienn9y+8hDc1pPACAROwgGelVJJwkB81GpV+APApRtkaVJ VcYCzbrpenWHG/V3DhjWTeSH/Bu7MJ2abd7oj/GwxBkKArLMRudNXHqJxW2F540l1QDa rIww== 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=iLPIhzkDHs+Xy1Y+FZJ8HaE1iB5GdkqbVuMDzehPqDQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=R4bZP8nJaIhCQtn3KeYzoAHfYXmfRCGxWg1ttpNHXVANrJ7day6PGxHB+QEyJmbUhi MIhVI97noYpRZnsTU3b0jD5s9LTunOC2MV0QLNmBwoYDc8OtZMkV+kGTf7Aeq73hiVeI VhdLD0kNdCly8D09cEdSL0wC+jt6rtw+oRMDasrt5ufxS8KXVbGVpvkAAmWdK+0QK9wU kRKhPGAZ1TM+pyddB2rQHahD0jGmOk9KnYs1czbAXC1m8IcwDK5LMo7T/cjOWvSZZaxQ IkYuEXG1uoR5Cq5MDHed4DJ9BSUkDKbfumQ5YbXbPifOT33Vdfag5tugbyxQViEL7ZmD FegA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=MTlPCGcs; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e13-20020a056402190d00b0053e0e813964si3587802edz.411.2023.10.14.20.27.40; Sat, 14 Oct 2023 20:27:41 -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=@gmail.com header.s=20230601 header.b=MTlPCGcs; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9072268C898; Sun, 15 Oct 2023 06:27:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0834768C651 for ; Sun, 15 Oct 2023 06:27:31 +0300 (EEST) Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-66d01345d73so22464956d6.2 for ; Sat, 14 Oct 2023 20:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697340449; x=1697945249; 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=7HC2vLvVnn0EmluCf7TYsBY8hBqqBn/YqK9UnttsnlU=; b=MTlPCGcsSrxaRVuYSZau7Qd7vMsAgGepqxYcBJyKM/xEt+eFFxvVVU1jWGnHFrkEZ5 OFw1hGtu1JHkOJ5+unjVd+F7/m6r/EP+WjDKzxEMglVi8iPOPFROFjmkkgCdkdDiiM7w bE6Jexs9gtAaMiw99gsEyOmfPm5tZxCzN1bBnlEW+B18JmHvfK/vrdmvTwQUG/SViaO6 SYDPetIT0SnYZTnVjrHAtAYoFA0ingjlDInq+SYP4kFUjpexlYQM/59XTR4qva7MtcB8 rKVes3JHA2JY6UORiPpjWeYTuayJVj8oS9SRs5xN5/VuuJsIJ9EN6jpDwtChVF90VwkC /uaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697340449; x=1697945249; 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=7HC2vLvVnn0EmluCf7TYsBY8hBqqBn/YqK9UnttsnlU=; b=xR1d+UkbMakR4IynLoe2Q6HQaA/6oG0V6Aou/U5Pj/xW/OccyDsDGukix2r9RtCBDA JiuNZX911gEoUHACnc1evOcanc22GAgry2Y990VzXObxrPPYxE5ookPyVq+Ua9CUFr0R GHQQSCNm4DC9z0bOjlWkjj9SDKivw7PI3FQ3sZQSAFuZe7edw8CTc1Dg0gCOIJYr+DG9 fx7On7BbM1bNzQKqTwzVcm20wBGo+37nloXHffUzhxbL6wMrt1cpH2VDeBTxqU+C46W6 zQigv+RwHLqsU64kE4Ee2b5EDPnemDBkYnJfhzuTuOgvfDkrHCbj9il/k9sfx2aq/3W0 x7nQ== X-Gm-Message-State: AOJu0YyDOItkIQMifkTEk/3RUIKnjOVUhw22Flzc5fBXZKaH8UilhYXW 73RAxkDXQThKj9SSgoQo9EPF2XaFqE0= X-Received: by 2002:a05:6214:29e6:b0:66d:1eae:4849 with SMTP id jv6-20020a05621429e600b0066d1eae4849mr10784563qvb.8.1697340449127; Sat, 14 Oct 2023 20:27:29 -0700 (PDT) Received: from elysia.mshome.net (76-10-166-251.dsl.teksavvy.com. [76.10.166.251]) by smtp.gmail.com with ESMTPSA id dm14-20020ad44e2e000000b0065cfec43097sm2219573qvb.39.2023.10.14.20.27.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 20:27:28 -0700 (PDT) From: Sean McGovern To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Oct 2023 23:27:24 -0400 Message-Id: <20231015032724.3590-1-gseanmcg@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined 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: PbhNqd7PXO5X It was not introduced until glibc 2.18. --- This should fix the ppc32 FATE node. --- libavutil/ppc/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c index 96b491c716..bc8bb5f47c 100644 --- a/libavutil/ppc/cpu.c +++ b/libavutil/ppc/cpu.c @@ -95,12 +95,15 @@ int ff_get_cpu_flags_ppc(void) #endif if (ret & AV_CPU_FLAG_VSX) av_assert0(ret & AV_CPU_FLAG_ALTIVEC); - } else if (buf[i] == AT_HWCAP2) { + } +#ifdef AT_HWCAP2 /* not introduced until glibc 2.18 */ + else if (buf[i] == AT_HWCAP2) { #ifdef PPC_FEATURE2_ARCH_2_07 if (buf[i + 1] & PPC_FEATURE2_ARCH_2_07) ret |= AV_CPU_FLAG_POWER8; #endif } +#endif /* AT_HWCAP2 */ } }