From patchwork Fri Apr 27 21:06:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Chaudhry X-Patchwork-Id: 8676 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1075920jad; Fri, 27 Apr 2018 14:12:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZolWFdqx8HgZ5RRcov+fpaU2tUAo2xq9gAP86CRQDM7TWeZF24tq1k/fjd1I8kjn/+m5Zq9 X-Received: by 10.28.5.18 with SMTP id 18mr2264414wmf.47.1524863519944; Fri, 27 Apr 2018 14:11:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524863519; cv=none; d=google.com; s=arc-20160816; b=vIqgMr1azF0fXKU/S3xKOITRASdpBdUVIMYxjCRa8w6LLHnyE1E097jBXZ8gmKCIb0 o1MANM0BK3yk15UrAgIBdsZMinIBvbSeCk8LAQDLQQF2iFtemqujupqTGdZubOS6Edi/ vq7/VvMnwW3uToyZMSjr+cx8FdybDqV7kOiDeFun0+OXTj4gseLguKfvZ4fmmfuVKzyu IF2FmT/JBSooQZbyhDxRi8ekCOqXpt81JRN5Rs9HL0aoAPcEYKWAktJl8rnwH2hJ47qo NsAsh5rOTd6L7UNFQEAkeF/Fq33YI/w3Jh/tMvqVgn/5B36AJO1yUdEOzfj0dbZI5f/j Blpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=kXVH15mv32dZpnKuJJg1vYkZ+c68EjuOuG4BR4UNpFM=; b=z1ITZ3eGhkEl7x0NZN8YnJ3kjZR1W0sllB1xyZWNBors8pfhbyKSRoWkVjUyJbypCW KUgEgy5ttTYWr1KEcVYO0keneUNm+gV2u/Z4BltfIdWiWcBz3ri+VK7NEn9DZ92t124z XuIKmU2c9+mpLBdlrnKWZOrIAPLj4vqKoKXO3mrHpe4mSY5egIaA1vOGU1YAtfYiNtRj 2VfFSZvrxBZb3tX7dvDnRS1pBtX4Pef4UHY8YISYnsJx3vaIateq3BjjDrpWP250YIwH C63oewBgRDCdlIlknfBOzuSReNN08mqzneqJal5RYiKjAJiSRPJFcGOQk3JaWGslilQ0 faaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=O+ZvMIRF; 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=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k48-v6si1767116wrc.51.2018.04.27.14.11.59; Fri, 27 Apr 2018 14:11:59 -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=@chromium.org header.s=google header.b=O+ZvMIRF; 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=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DF9D68A643; Sat, 28 Apr 2018 00:11:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f169.google.com (mail-yw0-f169.google.com [209.85.161.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C8FA68A61F for ; Sat, 28 Apr 2018 00:11:18 +0300 (EEST) Received: by mail-yw0-f169.google.com with SMTP id g16-v6so971328ywk.0 for ; Fri, 27 Apr 2018 14:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=U6uR1HndYkhSzKewmybzIQeqDafT+QGeUsKbibRib7M=; b=O+ZvMIRF4AYxYUyQuM9yaaVxgN/btJdfGGucUoKePuQBQrXOdq6nP78nNko1Y00xAK lf0090dAvnsayfVtABplBd9X8Yu8WV1AbJlakj/NIRkeilZ3j3nmc11G8Opgt88S7nxI n/6IFVRhqasFDf9q8hOQSVrG0Q+U/9yzfM2W4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=U6uR1HndYkhSzKewmybzIQeqDafT+QGeUsKbibRib7M=; b=h2ZRSTaREwq83VyeABJCp+GcGX7GK2fNOgYLe6B0mn/91n2mMOc0jEHU/TpOidazF1 3/HsOTjhaj+Vu1zlGyX6BhiCUkjQvt1j8FEsmdf7NOycwL0eOX2mQc2LI2IIgz9YiMJO jHBwiPn6oX/mcqJlE7ir9W/CZgb0h9YOwVcPaBeLd67brTKdEec4rZWNhvOjBKqFscs4 JX3EDSd9Mo8FlJVV/X7MTqMnu1y+A19hrOxL6HAK/EQgwsRipj9FAUgFC5H+XzpxkpPh 9Eoq+7VLDNWYDXNEIYoQPmpUs1QbZlQP68oUNI1H9+1rV5Nhzq80VmB7fCJxQGO1OcWR nonQ== X-Gm-Message-State: ALQs6tDuP07GZu0DH85qWbenrh5ERLfJxwoGTNalTckuSy5xTztcvVlI 1hUhB5HvWwwgLGsSSfsMQm7z5JaQwQk= X-Received: by 2002:a81:4942:: with SMTP id w63-v6mr1855700ywa.212.1524863167060; Fri, 27 Apr 2018 14:06:07 -0700 (PDT) Received: from mail-yw0-f172.google.com (mail-yw0-f172.google.com. [209.85.161.172]) by smtp.gmail.com with ESMTPSA id o186-v6sm908554ywc.98.2018.04.27.14.06.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 14:06:06 -0700 (PDT) Received: by mail-yw0-f172.google.com with SMTP id r202-v6so961051ywg.10 for ; Fri, 27 Apr 2018 14:06:05 -0700 (PDT) X-Received: by 2002:a81:48ce:: with SMTP id v197-v6mr1870282ywa.403.1524863165528; Fri, 27 Apr 2018 14:06:05 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:2c4a:0:0:0:0:0 with HTTP; Fri, 27 Apr 2018 14:06:04 -0700 (PDT) In-Reply-To: <20180419180609.GM20131@michaelspb> References: <20180416093125.GI20131@michaelspb> <20180417131730.GU20131@michaelspb> <20180418224607.GF20131@michaelspb> <20180419180609.GM20131@michaelspb> From: Rahul Chaudhry Date: Fri, 27 Apr 2018 14:06:04 -0700 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] swresample/arm: avoid conditional branch to PLT in THUMB-2. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It was reported on github that this patch causes build errors with xcode: https://github.com/FFmpeg/FFmpeg/commit/b22db4f465c9adb2cf1489e04f7b65ef6bb55b8b#commitcomment-28725295 The attached patch fixes the build errors by renaming the labels. This time I've tested it with clang from xcode on a MacBook to verify that the build works. Thanks, Rahul On Thu, Apr 19, 2018 at 11:06 AM, Michael Niedermayer wrote: > On Wed, Apr 18, 2018 at 04:40:28PM -0700, Rahul Chaudhry wrote: >> On Wed, Apr 18, 2018 at 3:46 PM, Michael Niedermayer >> wrote: >> > please make sure this works on apple based arm (unless you know it works) >> > (ive tested qemu linux based) >> > >> > Also please add a commit message >> >> If by 'apple based arm' you mean llvm/clang assembler, then yes, I've verified >> that the assembly works with armv7a-cros-linux-gnueabi-clang (version 7.0.0). >> >> Updated patch with new commit message is attached. >> >> Thanks, >> Rahul > >> From 2e3318acf266b519e98b680102a07196d6ddbf93 Mon Sep 17 00:00:00 2001 >> From: Rahul Chaudhry >> Date: Wed, 18 Apr 2018 16:29:39 -0700 >> Subject: [PATCH] swresample/arm: remove unintentional relocation. > > ok, will apply > > thx From a58b726947cc22081d899894036fa01933dfac0a Mon Sep 17 00:00:00 2001 From: Rahul Chaudhry Date: Fri, 27 Apr 2018 13:49:52 -0700 Subject: [PATCH] swresample/arm: rename labels to fix xcode build error --- libswresample/arm/audio_convert_neon.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git libswresample/arm/audio_convert_neon.S libswresample/arm/audio_convert_neon.S index 7729514701d3a02d04146f24cd9b12b11548ac64..085d50aafa5cf364e357d251a3986fad55643589 100644 --- libswresample/arm/audio_convert_neon.S +++ libswresample/arm/audio_convert_neon.S @@ -22,7 +22,7 @@ #include "libavutil/arm/asm.S" function swri_oldapi_conv_flt_to_s16_neon, export=1 -_swri_oldapi_conv_flt_to_s16_neon: +.L_swri_oldapi_conv_flt_to_s16_neon: subs r2, r2, #8 vld1.32 {q0}, [r1,:128]! vcvt.s32.f32 q8, q0, #31 @@ -67,7 +67,7 @@ _swri_oldapi_conv_flt_to_s16_neon: endfunc function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1 -_swri_oldapi_conv_fltp_to_s16_2ch_neon: +.L_swri_oldapi_conv_fltp_to_s16_2ch_neon: ldm r1, {r1, r3} subs r2, r2, #8 vld1.32 {q0}, [r1,:128]! @@ -135,8 +135,8 @@ function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1 cmp r3, #2 itt lt ldrlt r1, [r1] - blt _swri_oldapi_conv_flt_to_s16_neon - beq _swri_oldapi_conv_fltp_to_s16_2ch_neon + blt .L_swri_oldapi_conv_flt_to_s16_neon + beq .L_swri_oldapi_conv_fltp_to_s16_2ch_neon push {r4-r8, lr} cmp r3, #4