From patchwork Mon Nov 14 10:32:24 2016 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: 1414 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp971762vsb; Mon, 14 Nov 2016 02:38:46 -0800 (PST) X-Received: by 10.194.243.106 with SMTP id wx10mr23534748wjc.191.1479119926754; Mon, 14 Nov 2016 02:38:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a189si44274077wme.106.2016.11.14.02.38.46; Mon, 14 Nov 2016 02:38:46 -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.20150623.gappssmtp.com; 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 854B0689D50; Mon, 14 Nov 2016 12:38:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5AF1689BE4 for ; Mon, 14 Nov 2016 12:38:38 +0200 (EET) Received: by mail-lf0-f53.google.com with SMTP id t196so55068621lff.3 for ; Mon, 14 Nov 2016 02:38:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=4y4CZPK10H2OVQaE/iUWq+XVobFdsz59grgMe6lGMJ4=; b=KP2cdp7e4pgMPSrtwwjVq3gJYG698cCkKLvREalDZ9kA/TfUy9Ue7FuAXYtLc8aoWS sdXgqxqY9LX77lT2HOQxxYP5eFWDvub5p/Teg6n9KrOqRmcxkKLT/sGdQx/+huzfeFtG fBstT9sTvO8D1XVSTqpCJnb3Y6dBEqvmhh7reues++C4PzhL9Tr8Al9vBrjCeciePAVt y5+RTe9a6lUTdA5xag9FnFMtSx715y+Nll2h0tF7E4jfDQfawW8AjipejrBWZnENMoxj yT4OrU+4W5hUycfPoeZMBskCdzjKyi89XHSz1SmTdpjj0OpziIi4K5IG6CfK9LcdMc4q jE8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4y4CZPK10H2OVQaE/iUWq+XVobFdsz59grgMe6lGMJ4=; b=UFmjjJLB+3j36xj/iAzHunBxbHtSEmZDdQy8zsT+5apjb6ZOFvox5PMssLxm9y/kvM Ag2CI84a0xLRCtEv2x40dYH1VAZI09R05/pTb9eH63ohyHB6poFX8m+b0qq5spy1lrcR az80ewwltDSpVJ5djaTDY5pbsC/we7NB0186upLCW0OUB8FX/4fN3HLrKKzJVnMImkX2 Gr3/EvV6PVUz4uoQVcDdsHAjTAGZaeMQA6MBKWEpyAgj7FJh/XQezxna/ENMsxqF5P9h 5ljlQdw0hFG67wDMU0pArDSIDBATgh4qsTO1mcsROu/lP8ZVsZcFP+QCPyXvMJgz6EzP kZmQ== X-Gm-Message-State: ABUngvd14ShrXSpmoqt4oouRsqaVAqXKfcIZBCpTDyt3h8ZCWeU2YsbFdTRBKKySPEkQFA== X-Received: by 10.25.221.82 with SMTP id u79mr7729295lfg.52.1479119554428; Mon, 14 Nov 2016 02:32:34 -0800 (PST) Received: from localhost.localdomain ([2001:470:28:852:907f:a7ad:5ca8:25a7]) by smtp.gmail.com with ESMTPSA id w67sm4845727lff.16.2016.11.14.02.32.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Nov 2016 02:32:34 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Nov 2016 12:32:24 +0200 Message-Id: <1479119547-7392-6-git-send-email-martin@martin.st> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479119547-7392-1-git-send-email-martin@martin.st> References: <1479119547-7392-1-git-send-email-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 6/9] aarch64: Add an offset parameter to the movrel macro X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" With apple tools, the linker fails with errors like these, if the offset is negative: ld: in section __TEXT,__text reloc 8: symbol index out of range for architecture arm64 This is cherry-picked from libav commit c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c. --- libavutil/aarch64/asm.S | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index ff34e7a..523b8c5 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -72,15 +72,21 @@ ELF .size \name, . - \name \name: .endm -.macro movrel rd, val +.macro movrel rd, val, offset=0 #if CONFIG_PIC && defined(__APPLE__) + .if \offset < 0 adrp \rd, \val@PAGE add \rd, \rd, \val@PAGEOFF + sub \rd, \rd, -(\offset) + .else + adrp \rd, \val+(\offset)@PAGE + add \rd, \rd, \val+(\offset)@PAGEOFF + .endif #elif CONFIG_PIC - adrp \rd, \val - add \rd, \rd, :lo12:\val + adrp \rd, \val+\offset + add \rd, \rd, :lo12:\val+\offset #else - ldr \rd, =\val + ldr \rd, =\val+\offset #endif .endm