From patchwork Thu Jan 23 11:49:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 23615 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4F3E4203BE for ; Thu, 23 Jan 2014 11:49:41 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id kq14sf4218037pab.1 for ; Thu, 23 Jan 2014 03:49:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=S60/BbMGz7r5dzEW4RbGq55g7ph33lhsCSNdauNXr7E=; b=M2hXHm9aWy8dQwu/ZOwOtfkHoakliu5sZ4WKy3U921VL9QZh31qlvDac9l2fXMcMEG Xen3+QZ2b7ANw9nncrZHSq8Gd5YF057vsHdfvmPRX5Vp5PEQz5Fvkyy/IjrTmuEHkSO/ 0V+JUfnxwblD6lrpGgCHGdcx4/UramKBp6vidVARsuAOSeMzj3iHcLyzcZ+Qt5PVraS0 Ri65/ICNXkHIm0T2sqEeytqz0yKJa4D/zVSU5e42/1th4gzXBXq7DDQ2V8HsYqt8N6Cz S5iqxBSOxiJvjHHKPB4phgDNOP0fILpPWO6e1wFK8jkOKeyCILnCaFuT987bZoyY7BXD 4blg== X-Gm-Message-State: ALoCoQm7FoTXoP3oEoOpwcc+9ymU7euTUcYeTZsA+NkhrjozbX02n3pUizJB5W2KzEEtJYH/1Mne X-Received: by 10.66.163.67 with SMTP id yg3mr3096595pab.45.1390477780586; Thu, 23 Jan 2014 03:49:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.72.66 with SMTP id b2ls270778qev.36.gmail; Thu, 23 Jan 2014 03:49:40 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr211612veb.39.1390477780445; Thu, 23 Jan 2014 03:49:40 -0800 (PST) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id mw2si1435261vcb.94.2014.01.23.03.49.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 03:49:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id i3so969137vbh.15 for ; Thu, 23 Jan 2014 03:49:40 -0800 (PST) X-Received: by 10.221.40.10 with SMTP id to10mr4276001vcb.22.1390477780375; Thu, 23 Jan 2014 03:49:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp20336vcz; Thu, 23 Jan 2014 03:49:39 -0800 (PST) X-Received: by 10.180.14.231 with SMTP id s7mr24192792wic.1.1390477779417; Thu, 23 Jan 2014 03:49:39 -0800 (PST) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by mx.google.com with ESMTPS id de3si9028340wib.7.2014.01.23.03.49.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 03:49:39 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.179 is neither permitted nor denied by best guess record for domain of will.newton@linaro.org) client-ip=74.125.82.179; Received: by mail-we0-f179.google.com with SMTP id w62so995927wes.38 for ; Thu, 23 Jan 2014 03:49:39 -0800 (PST) X-Received: by 10.194.170.133 with SMTP id am5mr6320777wjc.42.1390477778962; Thu, 23 Jan 2014 03:49:38 -0800 (PST) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id uq2sm21700279wjc.5.2014.01.23.03.49.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2014 03:49:38 -0800 (PST) From: Will Newton To: libc-ports@sourceware.org Cc: patches@linaro.org, Will Newton Subject: [PATCH] ARM: Fix clone build for ARMv4 Date: Thu, 23 Jan 2014 11:49:31 +0000 Message-Id: <1390477771-30826-1-git-send-email-will.newton@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ARMv4 does not have the blx instruction, so use the BLX macro which handles abstracting this for us. ports/ChangeLog.arm: 2014-01-23 Will Newton [BZ #16499] * sysdeps/unix/sysv/linux/arm/clone.S: Use BLX macro instead of blx instruction directly. --- ports/sysdeps/unix/sysv/linux/arm/clone.S | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S index 44286a5..03fe9ab 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/clone.S +++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S @@ -88,14 +88,8 @@ PSEUDO_END (__clone) #endif @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] -#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) ldr ip, [sp], #8 - mov lr, pc - bx ip -#else - ldr lr, [sp], #8 - blx lr -#endif + BLX (ip) @ and we are done, passing the return value through r0 b PLTJMP(HIDDEN_JUMPTARGET(_exit))