From patchwork Wed Mar 9 13:14:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:4285:0:0:0:0 with SMTP id wq5csp1517756nkb; Wed, 9 Mar 2022 05:15:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxy3rcEgQfB/rd/LSq0kLuPezXxxWQlLE5gsBTrX+KmaVf4YH+Afj6S4+RFeMdT8WdxbLH X-Received: by 2002:a17:907:6e23:b0:6d7:713a:9747 with SMTP id sd35-20020a1709076e2300b006d7713a9747mr17013322ejc.411.1646831703352; Wed, 09 Mar 2022 05:15:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646831703; cv=none; d=google.com; s=arc-20160816; b=AxE42P+dAS6nSjkNYFD/iVgau9jZwINla92VKyEPXTFjns8ljlQBA4S2x5DYidfp9x rEXwuu1+9HkoDMQsykvwqDFi4m1+yTnYGJcS1Exa1qgXJyT6cgFTJHfi6+k4pHZ6dJzG 4Hhe3EDK9RDy9EaK/KcZu9xr2rnnIZhI9g7G3nFrocZ8bJhKWE+UUg1N2yshBg6ro5AM UyhzctY+ogV5epiLE6tPKpr1h6jDC6XmoSn/hprPETElkY5zInnvcMa+0ybKW6WiXntM 1X4zLRFkVabv5J2GyxzVH8z1t69Hb//6sZqQsMn6dE+x1UyDSfAqyUYQpLXbHc6sxRtH sjYw== 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=cIlI13CMc/eXkJ98e1UxNwCF7++JQ7LgNO16R0Yqpb8=; b=fFZ8aiAZnCwp0Ey3buCG/z7rBDYxhUSMRe2G22uLP/xlJkmEQ0T1dWb2Pn7bdOKYDD IykAs1J6cztGqHX6agw0UV0QSidgqklG1Ol6/f88Vk//5fCL0djcLOfhl4AwnlzFfmKz Eq55CzAi923/MR/qE1xv3ZYI2CeAvaKxvHaDlmKxzJEgyDUGoKWgSG/BbjVyUXLr4sqO TRDSy5FuqJ+74bVkC/63llHrN1Lq3Fgxi62ZT+phKlrwy74VKdlGLJUj6ZhxTzoGCHCs 9VP938DvI1aRfWoCYCwX/faY1T68nmJua7+LP76UmaSwu78LU/xui2bvgySNHjH9fhp2 ZUJQ== 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=Um7jtjjW; 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 ky7-20020a170907778700b006d10bc7483fsi1005810ejc.856.2022.03.09.05.14.40; Wed, 09 Mar 2022 05:15:03 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=Um7jtjjW; 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 B108C68AE56; Wed, 9 Mar 2022 15:14:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B21768A5C0 for ; Wed, 9 Mar 2022 15:14:30 +0200 (EET) Received: by mail-lj1-f171.google.com with SMTP id z26so2994704lji.8 for ; Wed, 09 Mar 2022 05:14:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0J/x0kyAnFGM/FN5qCYYOIa9OgzZSMZgRDBEiSQEwNQ=; b=Um7jtjjWyEk85a1SKVcr+O33dpg+Y1NpLieNvu6zXHW+y6NlXnn3w4yi5SlxyVcTtR viyudpiaNH9JbMMxaR336Hmw9IUXS5Adl9gXdJHhMwY/1O64l9SE4nMbf+CrhmFNH58A hsoCYrxj8179nkV7tTxF5SpOBZTW+YUJji2Z7xIEMgXpevij0x6EGa3GDprEB0c1+nJx Tt8LWLln8aIYgsTRcnr4QCBzpZ13wT0kn32BpxtV5zriNr7ZyoScnJeX1N+R8D7r3JlL HT28mvFoRfPWSk7XyxVOD9qlulGA2/lk6u7cNZPKbBQGTF5EMlzz0L35Ev67qnp1bbAk 1f1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0J/x0kyAnFGM/FN5qCYYOIa9OgzZSMZgRDBEiSQEwNQ=; b=KKAWacr+6BnQtUbFqEt9pZNNq9gIwsi5eXB6zqh+ensC/TwYmkCJ183vYbDJvNVxhf tX7svg18jlV+Q5KqwidQ4lyDaUYcc9njxiI9kCjBD4kJkTCN5AIHp4XXHrOfXTvvpd98 TF92MTkpm9WY1geJdGUhwf+yX4EKyldByXyAO9yilSpazkmgDzelaUKO6C9FesakvmYr YXZV6ZZir6q3f1fz63bTua5rCgAhxjPH4453OA422840/SxVXQQI+xw8hoYGSBiQBBeU xJ73rOJG7CtO0CH54sfffYMooGSSOHI/gC9Fie034yCQg2EHENJ4lVGhb7xclju2KJNn JREw== X-Gm-Message-State: AOAM533vugjYDlTq2w4w3L6wqLRPfuTZTFoed9QE2YVHi+n2Y4VRisHW f4/A2qLPPezPxhxeLAGfTryR/r3drqhEd4XE X-Received: by 2002:a05:651c:1791:b0:243:94bd:d94c with SMTP id bn17-20020a05651c179100b0024394bdd94cmr13615292ljb.468.1646831669345; Wed, 09 Mar 2022 05:14:29 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id p11-20020ac24ecb000000b004482df5aeadsm390319lfr.106.2022.03.09.05.14.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 09 Mar 2022 05:14:28 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Mar 2022 15:14:28 +0200 Message-Id: <20220309131428.52375-1-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aarch64: Only emit the PAC/BTI note section when targeting ELF 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: Andre Kempe Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Wa/PU3fkqGvg This avoids build errors if such features are enabled while targeting another binary format. (Using such features on other platforms might require some other form of signaling/setup though, but the ELF specific .note section isn't applicable at least.) Signed-off-by: Martin Storsjö --- libavutil/aarch64/asm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index b817eaab22..a7782415d7 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -141,7 +141,7 @@ #endif -#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0) +#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0) && defined(__ELF__) .pushsection .note.gnu.property, "a" .balign 8 .long 4